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

Fix Connect() calls in SetupChildEventHandling()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-09-30 16:46:36 +00:00
parent 28fb19ef29
commit 6d24f9a939
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/propgrid/propgrid.cpp
View File

@@ -3409,31 +3409,40 @@ void wxPropertyGrid::SetupChildEventHandling( wxWindow* argWnd )
if ( argWnd == m_wndEditor ) if ( argWnd == m_wndEditor )
{ {
this->Connect(id, wxEVT_MOTION, argWnd->Connect(id, wxEVT_MOTION,
wxMouseEventHandler(wxPropertyGrid::OnMouseMoveChild)); wxMouseEventHandler(wxPropertyGrid::OnMouseMoveChild),
this->Connect(id, wxEVT_LEFT_UP, NULL, this);
wxMouseEventHandler(wxPropertyGrid::OnMouseUpChild)); argWnd->Connect(id, wxEVT_LEFT_UP,
this->Connect(id, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxPropertyGrid::OnMouseUpChild),
wxMouseEventHandler(wxPropertyGrid::OnMouseClickChild)); NULL, this);
this->Connect(id, wxEVT_RIGHT_UP, argWnd->Connect(id, wxEVT_LEFT_DOWN,
wxMouseEventHandler(wxPropertyGrid::OnMouseRightClickChild)); wxMouseEventHandler(wxPropertyGrid::OnMouseClickChild),
this->Connect(id, wxEVT_ENTER_WINDOW, NULL, this);
wxMouseEventHandler(wxPropertyGrid::OnMouseEntry)); argWnd->Connect(id, wxEVT_RIGHT_UP,
this->Connect(id, wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxPropertyGrid::OnMouseRightClickChild),
wxMouseEventHandler(wxPropertyGrid::OnMouseEntry)); NULL, this);
argWnd->Connect(id, wxEVT_ENTER_WINDOW,
wxMouseEventHandler(wxPropertyGrid::OnMouseEntry),
NULL, this);
argWnd->Connect(id, wxEVT_LEAVE_WINDOW,
wxMouseEventHandler(wxPropertyGrid::OnMouseEntry),
NULL, this);
} }
else else
{ {
this->Connect(id, wxEVT_NAVIGATION_KEY, argWnd->Connect(id, wxEVT_NAVIGATION_KEY,
wxNavigationKeyEventHandler(wxPropertyGrid::OnNavigationKey)); wxNavigationKeyEventHandler(wxPropertyGrid::OnNavigationKey));
} }
this->Connect(id, wxEVT_KEY_DOWN, argWnd->Connect(id, wxEVT_KEY_DOWN,
wxKeyEventHandler(wxPropertyGrid::OnChildKeyDown)); wxKeyEventHandler(wxPropertyGrid::OnChildKeyDown),
this->Connect(id, wxEVT_KEY_UP, NULL, this);
wxKeyEventHandler(wxPropertyGrid::OnChildKeyUp)); argWnd->Connect(id, wxEVT_KEY_UP,
this->Connect(id, wxEVT_KILL_FOCUS, wxKeyEventHandler(wxPropertyGrid::OnChildKeyUp),
wxFocusEventHandler(wxPropertyGrid::OnFocusEvent)); NULL, this);
argWnd->Connect(id, wxEVT_KILL_FOCUS,
wxFocusEventHandler(wxPropertyGrid::OnFocusEvent),
NULL, this);
} }
void wxPropertyGrid::FreeEditors() void wxPropertyGrid::FreeEditors()