X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/758a81148625d41e055ecde4faab6ad600439769..890defb4f3a0012a296c69949bf5f93075743e8f:/src/generic/choicbkg.cpp diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index 4b3194bcc0..c21023c25b 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -49,8 +49,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase) -wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase) EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected) @@ -176,22 +176,29 @@ wxString wxChoicebook::GetPageText(size_t n) const int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const { - wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") ); + wxFAIL_MSG( wxT("wxChoicebook::GetPageImage() not implemented") ); return wxNOT_FOUND; } bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) { - wxFAIL_MSG( _T("wxChoicebook::SetPageImage() not implemented") ); + wxFAIL_MSG( wxT("wxChoicebook::SetPageImage() not implemented") ); return false; } // ---------------------------------------------------------------------------- -// image list stuff +// miscellaneous other stuff // ---------------------------------------------------------------------------- +void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant) +{ + wxBookCtrlBase::DoSetWindowVariant(variant); + if (m_bookctrl) + m_bookctrl->SetWindowVariant(variant); +} + void wxChoicebook::SetImageList(wxImageList *imageList) { // TODO: can be implemented in form of static bitmap near choice control