X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc66bf5af819696068db70647bd2906feb578082..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/choicebk.h?ds=sidebyside diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index cbb17693f8..0c06f3c5ff 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -19,11 +19,18 @@ #include "wx/bookctrl.h" #include "wx/choice.h" -class WXDLLEXPORT wxChoice; +class WXDLLIMPEXP_FWD_CORE wxChoice; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED; extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING; +// wxChoicebook flags +#define wxCHB_DEFAULT wxBK_DEFAULT +#define wxCHB_TOP wxBK_TOP +#define wxCHB_BOTTOM wxBK_BOTTOM +#define wxCHB_LEFT wxBK_LEFT +#define wxCHB_RIGHT wxBK_RIGHT +#define wxCHB_ALIGN_MASK wxBK_ALIGN_MASK // ---------------------------------------------------------------------------- // wxChoicebook @@ -84,18 +91,14 @@ protected: // get the size which the choice control should have virtual wxSize GetControllerSize() const; - int DoSetSelection(size_t nPage, int flags = 0); - void UpdateSelectedPage(size_t newsel) { m_selection = newsel; GetChoiceCtrl()->Select(newsel); } - void MakeChangedEvent(wxBookCtrlBaseEvent &event) - { - event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED); - } + wxBookCtrlBaseEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlBaseEvent &event); // event handlers void OnChoiceSelected(wxCommandEvent& event);