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

Avoid clash with control container event handlers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-18 11:34:45 +00:00
parent 1c1ad00573
commit 5bf3f27fc9
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/aui/auibook.h
View File

@@ -598,7 +598,7 @@ protected:
protected: protected:
void OnChildFocus(wxChildFocusEvent& evt); void OnChildFocusNotebook(wxChildFocusEvent& evt);
void OnRender(wxAuiManagerEvent& evt); void OnRender(wxAuiManagerEvent& evt);
void OnSize(wxSizeEvent& evt); void OnSize(wxSizeEvent& evt);
void OnTabClicked(wxCommandEvent& evt); void OnTabClicked(wxCommandEvent& evt);
@@ -610,7 +610,7 @@ protected:
void OnTabMiddleUp(wxCommandEvent& evt); void OnTabMiddleUp(wxCommandEvent& evt);
void OnTabRightDown(wxCommandEvent& evt); void OnTabRightDown(wxCommandEvent& evt);
void OnTabRightUp(wxCommandEvent& evt); void OnTabRightUp(wxCommandEvent& evt);
void OnNavigationKey(wxNavigationKeyEvent& event); void OnNavigationKeyNotebook(wxNavigationKeyEvent& event);
// set selection to the given window (which must be non-NULL and be one of // set selection to the given window (which must be non-NULL and be one of
// our pages, otherwise an assert is raised) // our pages, otherwise an assert is raised)

13
src/aui/auibook.cpp
View File

@@ -2684,7 +2684,7 @@ const int wxAuiBaseTabCtrlId = 5380;
BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
EVT_SIZE(wxAuiNotebook::OnSize) EVT_SIZE(wxAuiNotebook::OnSize)
EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocus) EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocusNotebook)
EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
wxAuiNotebook::OnTabClicked) wxAuiNotebook::OnTabClicked)
@@ -2712,9 +2712,14 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP,
wxAuiNotebook::OnTabRightUp) wxAuiNotebook::OnTabRightUp)
EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKey) EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook)
#ifdef wxHAS_NATIVE_TAB_TRAVERSAL
WX_EVENT_TABLE_CONTROL_CONTAINER(wxAuiNotebook) WX_EVENT_TABLE_CONTROL_CONTAINER(wxAuiNotebook)
#else
// Avoid clash with container event handler functions
EVT_SET_FOCUS(wxAuiNotebook::OnFocus)
#endif
END_EVENT_TABLE() END_EVENT_TABLE()
WX_DELEGATE_TO_CONTROL_CONTAINER(wxAuiNotebook, wxControl) WX_DELEGATE_TO_CONTROL_CONTAINER(wxAuiNotebook, wxControl)
@@ -4000,7 +4005,7 @@ void wxAuiNotebook::RemoveEmptyTabFrames()
m_mgr.Update(); m_mgr.Update();
} }
void wxAuiNotebook::OnChildFocus(wxChildFocusEvent& evt) void wxAuiNotebook::OnChildFocusNotebook(wxChildFocusEvent& evt)
{ {
// if we're dragging a tab, don't change the current selection. // if we're dragging a tab, don't change the current selection.
// This code prevents a bug that used to happen when the hint window // This code prevents a bug that used to happen when the hint window
@@ -4030,7 +4035,7 @@ void wxAuiNotebook::OnChildFocus(wxChildFocusEvent& evt)
} }
} }
void wxAuiNotebook::OnNavigationKey(wxNavigationKeyEvent& event) void wxAuiNotebook::OnNavigationKeyNotebook(wxNavigationKeyEvent& event)
{ {
if ( event.IsWindowChange() ) { if ( event.IsWindowChange() ) {
// change pages // change pages