From: Vadim Zeitlin Date: Sun, 25 Jan 2009 11:11:27 +0000 (+0000) Subject: implement wxChoicebook::SetWindowVariant() by forwarding it to wxChoice (see #10398) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/64c38b4be828b7b18f7d51f80eb9848f1cccf40e implement wxChoicebook::SetWindowVariant() by forwarding it to wxChoice (see #10398) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 8519a6bf2e..7f65e4216f 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -76,7 +76,8 @@ public: const wxString& text, bool bSelect = false, int imageId = -1); - virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); } + 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); @@ -86,6 +87,8 @@ public: 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 diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index 4b3194bcc0..057071f96e 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -189,9 +189,16 @@ bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) } // ---------------------------------------------------------------------------- -// image list stuff +// miscellaneous other stuff // ---------------------------------------------------------------------------- +void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant) +{ + wxCHECK_RET( m_bookctrl, "can't be called before control creation" ); + + m_bookctrl->SetWindowVariant(variant); +} + void wxChoicebook::SetImageList(wxImageList *imageList) { // TODO: can be implemented in form of static bitmap near choice control