X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8dba4c72300eafb6b35eaf754c379a72416bfbdd..bcf324bebe65cd7ee49c139533ceea52dceb4b91:/src/cocoa/notebook.mm diff --git a/src/cocoa/notebook.mm b/src/cocoa/notebook.mm index 86bf26460a..0bad47d58d 100644 --- a/src/cocoa/notebook.mm +++ b/src/cocoa/notebook.mm @@ -124,13 +124,6 @@ WX_DECLARE_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem) @end // implementation WXCTabViewImageItem : NSTabViewItem WX_IMPLEMENT_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem) -// ======================================================================== -// wxNotebookEvent -// ======================================================================== -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) -IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) - // ======================================================================== // wxNotebook // ======================================================================== @@ -315,14 +308,15 @@ int wxNotebook::GetSelection() const void wxNotebook::CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabViewItem) { // FIXME: oldSel probably == newSel - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId(), + wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId(), [GetNSTabView() indexOfTabViewItem:tabViewItem], GetSelection()); event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } bool wxNotebook::CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabViewItem) { - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId(), + wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId(), [GetNSTabView() indexOfTabViewItem:tabViewItem], GetSelection()); event.SetEventObject(this); return !HandleWindowEvent(event) || event.IsAllowed();