X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5e0b4bc7c729ff41e66fb7894fb1387f860bdb2..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/choicebk.h?ds=sidebyside diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 17f50bdc8d..0c06f3c5ff 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -12,43 +12,31 @@ #ifndef _WX_CHOICEBOOK_H_ #define _WX_CHOICEBOOK_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "choicebook.h" -#endif - #include "wx/defs.h" #if wxUSE_CHOICEBOOK #include "wx/bookctrl.h" +#include "wx/choice.h" -class WXDLLEXPORT wxChoice; - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// wxChoicebook styles -enum -{ - // default alignment: top everywhere - wxCHB_DEFAULT = 0, +class WXDLLIMPEXP_FWD_CORE wxChoice; - // put the choice control to the left/right/top/bottom of the page area - wxCHB_TOP = 0x1, - wxCHB_BOTTOM = 0x2, - wxCHB_LEFT = 0x4, - wxCHB_RIGHT = 0x8, +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED; +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING; - // the mask which can be used to extract the alignment from the style - wxCHB_ALIGN_MASK = 0xf -}; +// 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 wxBookCtrl +class WXDLLEXPORT wxChoicebook : public wxBookCtrlBase { public: wxChoicebook() @@ -88,38 +76,39 @@ 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 (wxChoice*)m_bookctrl; } + protected: virtual wxWindow *DoRemovePage(size_t page); -private: - // common part of all constructors - void Init(); - // get the size which the choice control should have - wxSize GetChoiceSize() const; + virtual wxSize GetControllerSize() const; + + void UpdateSelectedPage(size_t newsel) + { + m_selection = newsel; + GetChoiceCtrl()->Select(newsel); + } - // get the page area - wxRect GetPageRect() const; + wxBookCtrlBaseEvent* CreatePageChangingEvent() const; + void MakeChangedEvent(wxBookCtrlBaseEvent &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; +private: + // common part of all constructors + void Init(); DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook) @@ -129,41 +118,36 @@ private: // choicebook event class and related stuff // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlEvent +class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlBaseEvent { public: wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = -1, int nOldSel = -1) - : wxBookCtrlEvent(commandType, id, nSel, nOldSel) + : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel) + { + } + + wxChoicebookEvent(const wxChoicebookEvent& event) + : wxBookCtrlBaseEvent(event) { } + virtual wxEvent *Clone() const { return new wxChoicebookEvent(*this); } + private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebookEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(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 EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ), \ - NULL \ - ), - -#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, \ - id, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxChoicebookEventFunction, &fn ), \ - NULL \ - ), +#define wxChoicebookEventHandler(func) \ + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func) + +#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn)) + +#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn)) #endif // wxUSE_CHOICEBOOK