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

another notebook event fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-11-24 21:27:55 +00:00
parent 5c96be628f
commit 7ebc40e8b9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/aui/auibook.cpp
View File

@@ -2316,7 +2316,7 @@ public:
}; };
const int wxAuiBaseTabCtrlId = 5380;
// -- wxAuiNotebook class implementation -- // -- wxAuiNotebook class implementation --
@@ -2324,19 +2324,19 @@ public:
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::OnChildFocus)
EVT_COMMAND_RANGE(10000, 10100, EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
wxAuiNotebook::OnTabClicked) wxAuiNotebook::OnTabClicked)
EVT_COMMAND_RANGE(10000, 10100, EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
wxAuiNotebook::OnTabBeginDrag) wxAuiNotebook::OnTabBeginDrag)
EVT_COMMAND_RANGE(10000, 10100, EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
wxAuiNotebook::OnTabEndDrag) wxAuiNotebook::OnTabEndDrag)
EVT_COMMAND_RANGE(10000, 10100, EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
wxAuiNotebook::OnTabDragMotion) wxAuiNotebook::OnTabDragMotion)
EVT_COMMAND_RANGE(10000, 10100, EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_BUTTON, wxEVT_COMMAND_AUINOTEBOOK_BUTTON,
wxAuiNotebook::OnTabButton) wxAuiNotebook::OnTabButton)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -2344,7 +2344,7 @@ END_EVENT_TABLE()
wxAuiNotebook::wxAuiNotebook() wxAuiNotebook::wxAuiNotebook()
{ {
m_curpage = -1; m_curpage = -1;
m_tab_id_counter = 10000; m_tab_id_counter = wxAuiBaseTabCtrlId;
m_dummy_wnd = NULL; m_dummy_wnd = NULL;
m_tab_ctrl_height = 20; m_tab_ctrl_height = 20;
m_requested_bmp_size = wxDefaultSize; m_requested_bmp_size = wxDefaultSize;
@@ -2382,7 +2382,7 @@ bool wxAuiNotebook::Create(wxWindow* parent,
void wxAuiNotebook::InitNotebook(long style) void wxAuiNotebook::InitNotebook(long style)
{ {
m_curpage = -1; m_curpage = -1;
m_tab_id_counter = 10000; m_tab_id_counter = wxAuiBaseTabCtrlId;
m_dummy_wnd = NULL; m_dummy_wnd = NULL;
m_flags = (unsigned int)style; m_flags = (unsigned int)style;
m_tab_ctrl_height = 20; m_tab_ctrl_height = 20;
@@ -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 (!GetParent()->GetEventHandler()->ProcessEvent(evt) || evt.IsAllowed()) if (!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)GetParent()->GetEventHandler()->ProcessEvent(evt); (void)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);
GetParent()->GetEventHandler()->ProcessEvent(e); GetEventHandler()->ProcessEvent(e);
if (!e.IsAllowed()) if (!e.IsAllowed())
return; return;