X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/681be2ef80274e6c39b243922a594c59e4983dab..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/toolbook.h?ds=sidebyside diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h index d39df2e99f..86d50d57b6 100644 --- a/include/wx/toolbook.h +++ b/include/wx/toolbook.h @@ -17,6 +17,7 @@ #if wxUSE_TOOLBOOK #include "wx/bookctrl.h" +#include "wx/containr.h" class WXDLLIMPEXP_FWD_CORE wxToolBarBase; class WXDLLIMPEXP_FWD_CORE wxCommandEvent; @@ -40,7 +41,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING // wxToolbook // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxToolbook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxToolbook : public wxNavigationEnabled { public: wxToolbook() @@ -78,7 +79,7 @@ public: wxWindow *page, const wxString& text, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); 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); @@ -128,7 +129,7 @@ private: // ---------------------------------------------------------------------------- // wxToolbookEvent is obsolete and defined for compatibility only -typedef wxBookCtrlEvent wxToolbookEvent; +#define wxToolbookEvent wxBookCtrlEvent typedef wxBookCtrlEventFunction wxToolbookEventFunction; #define wxToolbookEventHandler(func) wxBookCtrlEventHandler(func)