X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3507dd8517e922f499cddc30693dcb284815c0a..3143722d5a072e17b1ab2e03210321d2ba58f39a:/src/generic/toolbkg.cpp diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp index 1693b3cfe2..c371989713 100644 --- a/src/generic/toolbkg.cpp +++ b/src/generic/toolbkg.cpp @@ -44,10 +44,9 @@ // ---------------------------------------------------------------------------- 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(); +wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, wxBookCtrlEvent ) BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase) EVT_SIZE(wxToolbook::OnSize) @@ -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); }