X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/050d159c4a0fc1fd9db756c3ea0d534dbd784a90..8946ede10c2702c7acbb194fe8bd2793d7fb8358:/src/generic/toolbkg.cpp diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp index 960387ef0a..969960b988 100644 --- a/src/generic/toolbkg.cpp +++ b/src/generic/toolbkg.cpp @@ -44,7 +44,6 @@ // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase) -IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent) const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType(); const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType(); @@ -99,7 +98,7 @@ bool wxToolbook::Create(wxWindow *parent, // TODO: make more configurable #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON - if (style & wxBK_BUTTONBAR) + if (style & wxTBK_BUTTONBAR) { m_bookctrl = new wxButtonToolBar ( @@ -247,12 +246,12 @@ int wxToolbook::GetSelection() const return m_selection; } -wxBookCtrlBaseEvent* wxToolbook::CreatePageChangingEvent() const +wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const { - return new wxToolbookEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId); + return new wxBookCtrlEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId); } -void wxToolbook::MakeChangedEvent(wxBookCtrlBaseEvent &event) +void wxToolbook::MakeChangedEvent(wxBookCtrlEvent &event) { event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED); }