X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/choicebk.h?ds=sidebyside diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 2d86b96965..7f65e4216f 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -17,14 +17,26 @@ #if wxUSE_CHOICEBOOK #include "wx/bookctrl.h" +#include "wx/choice.h" -class WXDLLEXPORT wxChoice; +class WXDLLIMPEXP_FWD_CORE wxChoice; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ) +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ) + +// 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 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoicebook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxChoicebook : public wxBookCtrlBase { public: wxChoicebook() @@ -64,33 +76,36 @@ 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); - // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style - bool IsVertical() const { return HasFlag(wxCHB_BOTTOM | wxCHB_TOP); } - virtual bool DeleteAllPages(); // returns the choice control - wxChoice* GetChoiceCtrl() const { return m_choice; } + wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; } protected: + virtual void DoSetWindowVariant(wxWindowVariant variant); + virtual wxWindow *DoRemovePage(size_t page); // get the size which the choice control should have - wxSize GetChoiceSize() const; + virtual wxSize GetControllerSize() const; - // get the page area - wxRect GetPageRect() const; + void UpdateSelectedPage(size_t newsel) + { + m_selection = static_cast(newsel); + GetChoiceCtrl()->Select(newsel); + } + + wxBookCtrlEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlEvent &event); // event handlers - void OnSize(wxSizeEvent& event); void OnChoiceSelected(wxCommandEvent& event); - // the choice control we use for showing the pages index - wxChoice *m_choice; - // the currently selected page or wxNOT_FOUND if none int m_selection; @@ -106,32 +121,16 @@ private: // choicebook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlBaseEvent -{ -public: - wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, - int nSel = -1, int nOldSel = -1) - : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel) - { - } - -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebookEvent) -}; - -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING; - -typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&); - -#define wxChoicebookEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func) +// wxChoicebookEvent is obsolete and defined for compatibility only +typedef wxBookCtrlEvent wxChoicebookEvent; +typedef wxBookCtrlEventFunction wxChoicebookEventFunction; +#define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func) #define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) #define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) #endif // wxUSE_CHOICEBOOK