X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64c38b4be828b7b18f7d51f80eb9848f1cccf40e..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/choicebk.h diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 7f65e4216f..6c9f7d4980 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -18,11 +18,12 @@ #include "wx/bookctrl.h" #include "wx/choice.h" +#include "wx/containr.h" 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 ) +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 @@ -36,13 +37,10 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGI // wxChoicebook // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxChoicebook : public wxBookCtrlBase +class WXDLLIMPEXP_CORE wxChoicebook : public wxNavigationEnabled { public: - wxChoicebook() - { - Init(); - } + wxChoicebook() { } wxChoicebook(wxWindow *parent, wxWindowID id, @@ -51,8 +49,6 @@ public: long style = 0, const wxString& name = wxEmptyString) { - Init(); - (void)Create(parent, id, pos, size, style, name); } @@ -65,17 +61,15 @@ public: const wxString& name = wxEmptyString); - virtual int GetSelection() const; virtual bool SetPageText(size_t n, const wxString& strText); virtual wxString GetPageText(size_t n) const; virtual int GetPageImage(size_t n) const; virtual bool SetPageImage(size_t n, int imageId); - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual bool InsertPage(size_t n, 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); } @@ -86,18 +80,20 @@ public: // returns the choice control wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; } + // Override this to return true because the part of parent window + // background between our controlling wxChoice and the page area should + // show through. + virtual bool HasTransparentBackground() { return true; } + protected: virtual void DoSetWindowVariant(wxWindowVariant variant); virtual wxWindow *DoRemovePage(size_t page); - // get the size which the choice control should have - virtual wxSize GetControllerSize() const; - void UpdateSelectedPage(size_t newsel) { m_selection = static_cast(newsel); - GetChoiceCtrl()->Select(newsel); + GetChoiceCtrl()->Select(m_selection); } wxBookCtrlEvent* CreatePageChangingEvent() const; @@ -106,13 +102,7 @@ protected: // event handlers void OnChoiceSelected(wxCommandEvent& event); - // 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) }; @@ -122,7 +112,7 @@ private: // ---------------------------------------------------------------------------- // wxChoicebookEvent is obsolete and defined for compatibility only -typedef wxBookCtrlEvent wxChoicebookEvent; +#define wxChoicebookEvent wxBookCtrlEvent typedef wxBookCtrlEventFunction wxChoicebookEventFunction; #define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func)