use wxID_ANY for internal controller control instead of wxID_CHOICE/LIST/TOOLBAR/TREEBOOKTREEVIEW; this fixes asserts about using negative ids after last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -50,7 +50,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
|
||||
const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
|
||||
const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();
|
||||
#endif
|
||||
const int wxID_TOOLBOOKTOOLBAR = wxWindow::NewControlId();
|
||||
|
||||
BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
|
||||
EVT_SIZE(wxToolbook::OnSize)
|
||||
@@ -102,7 +101,7 @@ bool wxToolbook::Create(wxWindow *parent,
|
||||
m_bookctrl = new wxButtonToolBar
|
||||
(
|
||||
this,
|
||||
wxID_TOOLBOOKTOOLBAR,
|
||||
wxID_ANY,
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER
|
||||
@@ -114,7 +113,7 @@ bool wxToolbook::Create(wxWindow *parent,
|
||||
m_bookctrl = new wxToolBar
|
||||
(
|
||||
this,
|
||||
wxID_TOOLBOOKTOOLBAR,
|
||||
wxID_ANY,
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
|
||||
|
||||
Reference in New Issue
Block a user