fixed notebook event bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2806,14 +2806,14 @@ size_t wxAuiNotebook::SetSelection(size_t new_page)
|
|||||||
evt.SetSelection(new_page);
|
evt.SetSelection(new_page);
|
||||||
evt.SetOldSelection(m_curpage);
|
evt.SetOldSelection(m_curpage);
|
||||||
evt.SetEventObject(this);
|
evt.SetEventObject(this);
|
||||||
if (!GetEventHandler()->ProcessEvent(evt) || evt.IsAllowed())
|
if (!GetParent()->GetEventHandler()->ProcessEvent(evt) || evt.IsAllowed())
|
||||||
{
|
{
|
||||||
int old_curpage = m_curpage;
|
int old_curpage = m_curpage;
|
||||||
m_curpage = new_page;
|
m_curpage = new_page;
|
||||||
|
|
||||||
// program allows the page change
|
// program allows the page change
|
||||||
evt.SetEventType(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED);
|
evt.SetEventType(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED);
|
||||||
(void)GetEventHandler()->ProcessEvent(evt);
|
(void)GetParent()->GetEventHandler()->ProcessEvent(evt);
|
||||||
|
|
||||||
|
|
||||||
wxAuiTabCtrl* ctrl;
|
wxAuiTabCtrl* ctrl;
|
||||||
@@ -3437,7 +3437,7 @@ void wxAuiNotebook::OnTabButton(wxCommandEvent& command_evt)
|
|||||||
e.SetSelection(m_tabs.GetIdxFromWindow(close_wnd));
|
e.SetSelection(m_tabs.GetIdxFromWindow(close_wnd));
|
||||||
e.SetOldSelection(evt.GetSelection());
|
e.SetOldSelection(evt.GetSelection());
|
||||||
e.SetEventObject(this);
|
e.SetEventObject(this);
|
||||||
GetEventHandler()->ProcessEvent(e);
|
GetParent()->GetEventHandler()->ProcessEvent(e);
|
||||||
if (!e.IsAllowed())
|
if (!e.IsAllowed())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user