X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0a84b63384ca1c1d8d20581fb56abbd1d826617..19c4d91638c2546630c4427e39c02f5380a8bb87:/include/wx/toolbook.h diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index 1227d82483..404933ee50 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -18,8 +18,12 @@ #include "wx/bookctrl.h" -class WXDLLEXPORT wxToolBarBase; -class WXDLLEXPORT wxCommandEvent; +class WXDLLIMPEXP_FWD_CORE wxToolBarBase; +class WXDLLIMPEXP_FWD_CORE wxCommandEvent; + +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED; +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING; + // Use wxButtonToolBar #define wxBK_BUTTONBAR 0x0100 @@ -69,7 +73,8 @@ public: const wxString& text, bool bSelect = false, int imageId = -1); - virtual int SetSelection(size_t n); + virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } + virtual int ChangeSelection(size_t n) { return DoSetSelection(n); } virtual void SetImageList(wxImageList *imageList); virtual bool DeleteAllPages(); @@ -96,6 +101,11 @@ protected: void OnSize(wxSizeEvent& event); void OnIdle(wxIdleEvent& event); + void UpdateSelectedPage(size_t newsel); + + wxBookCtrlBaseEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlBaseEvent &event); + // the currently selected page or wxNOT_FOUND if none int m_selection; @@ -137,9 +147,6 @@ private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxToolbookEvent) }; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING; - typedef void (wxEvtHandler::*wxToolbookEventFunction)(wxToolbookEvent&); #define wxToolbookEventHandler(func) \