Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Connect to events only if using native implementation instead of using event table. Closes #12469

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Tim Kosse
2010-10-02 09:39:58 +00:00
parent df53be12c5
commit 864186dd39
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/osx/listctrl.h
View File

@@ -420,7 +420,6 @@ protected:
private: private:
int CalcColumnAutoWidth(int col) const; int CalcColumnAutoWidth(int col) const;
DECLARE_EVENT_TABLE()
}; };
#endif #endif

25
src/osx/carbon/listctrl_mac.cpp
View File

@@ -519,14 +519,6 @@ void wxListCtrlTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
event.Skip(); event.Skip();
} }
BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
EVT_LEFT_DOWN(wxListCtrl::OnLeftDown)
EVT_LEFT_DCLICK(wxListCtrl::OnDblClick)
EVT_MIDDLE_DOWN(wxListCtrl::OnMiddleDown)
EVT_RIGHT_DOWN(wxListCtrl::OnRightDown)
EVT_CHAR(wxListCtrl::OnChar)
END_EVENT_TABLE()
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================
@@ -561,7 +553,7 @@ void wxListCtrl::Init()
m_bgColor = wxNullColour; m_bgColor = wxNullColour;
m_textctrlWrapper = NULL; m_textctrlWrapper = NULL;
m_current = -1; m_current = -1;
m_renameTimer = new wxListCtrlRenameTimer( this ); m_renameTimer = NULL;
} }
class wxGenericListCtrlHook : public wxGenericListCtrl class wxGenericListCtrlHook : public wxGenericListCtrl
@@ -618,7 +610,8 @@ void wxListCtrl::OnLeftDown(wxMouseEvent& event)
(hitResult & wxLIST_HITTEST_ONITEMLABEL) && (hitResult & wxLIST_HITTEST_ONITEMLABEL) &&
HasFlag(wxLC_EDIT_LABELS) ) HasFlag(wxLC_EDIT_LABELS) )
{ {
m_renameTimer->Start( 100, true ); if ( m_renameTimer )
m_renameTimer->Start( 250, true );
} }
else else
{ {
@@ -629,7 +622,7 @@ void wxListCtrl::OnLeftDown(wxMouseEvent& event)
void wxListCtrl::OnDblClick(wxMouseEvent& event) void wxListCtrl::OnDblClick(wxMouseEvent& event)
{ {
if ( m_renameTimer->IsRunning() ) if ( m_renameTimer && m_renameTimer->IsRunning() )
m_renameTimer->Stop(); m_renameTimer->Stop();
event.Skip(); event.Skip();
} }
@@ -754,7 +747,7 @@ bool wxListCtrl::Create(wxWindow *parent,
else else
{ {
m_macIsUserPane = false; m_macIsUserPane = false;
if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) ) if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) )
return false; return false;
m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style ); m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );
@@ -765,6 +758,14 @@ bool wxListCtrl::Create(wxWindow *parent,
InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(), InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this, GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_macListCtrlEventHandler); (EventHandlerRef *)&m_macListCtrlEventHandler);
m_renameTimer = new wxListCtrlRenameTimer( this );
Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );
Connect( wxID_ANY, wxEVT_MIDDLE_DOWN, wxMouseEventHandler(wxListCtrl::OnMiddleDown), NULL, this );
Connect( wxID_ANY, wxEVT_RIGHT_DOWN, wxMouseEventHandler(wxListCtrl::OnRightDown), NULL, this );
} }
return true; return true;