X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/175363f6b89e94e6d5f7dc39235fbc3f2989d763..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/choicebk.h diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 76a0387392..cbdd5ff61e 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_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_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,7 +61,6 @@ 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; @@ -74,7 +69,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); } @@ -85,6 +80,11 @@ 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); @@ -102,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) }; @@ -118,15 +112,19 @@ private: // ---------------------------------------------------------------------------- // wxChoicebookEvent is obsolete and defined for compatibility only -typedef wxBookCtrlEvent wxChoicebookEvent; +#define wxChoicebookEvent wxBookCtrlEvent typedef wxBookCtrlEventFunction wxChoicebookEventFunction; #define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func) #define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn)) #define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) + wx__DECLARE_EVT1(wxEVT_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn)) + +// old wxEVT_COMMAND_* constants +#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED wxEVT_CHOICEBOOK_PAGE_CHANGED +#define wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING wxEVT_CHOICEBOOK_PAGE_CHANGING #endif // wxUSE_CHOICEBOOK