X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42841dfcaddc6045ffc618acbb620b1fde1bc618..e163773d412f8dd640c3b6d5b5cca018d4a974db:/src/generic/choicbkg.cpp diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index 15390adec2..c40ba14fe4 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -64,7 +64,7 @@ const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType(); const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType(); const int wxID_CHOICEBOOKCHOICE = wxNewId(); -BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrl) +BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase) EVT_SIZE(wxChoicebook::OnSize) EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected) END_EVENT_TABLE() @@ -276,7 +276,7 @@ void wxChoicebook::SetImageList(wxImageList *imageList) { // TODO: can be implemented in form of static bitmap near choice control - wxBookCtrl::SetImageList(imageList); + wxBookCtrlBase::SetImageList(imageList); } // ---------------------------------------------------------------------------- @@ -334,7 +334,7 @@ wxChoicebook::InsertPage(size_t n, bool bSelect, int imageId) { - if ( !wxBookCtrl::InsertPage(n, page, text, bSelect, imageId) ) + if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) ) return false; m_choice->Insert(text, n); @@ -369,7 +369,7 @@ wxChoicebook::InsertPage(size_t n, wxWindow *wxChoicebook::DoRemovePage(size_t page) { const int page_count = GetPageCount(); - wxWindow *win = wxBookCtrl::DoRemovePage(page); + wxWindow *win = wxBookCtrlBase::DoRemovePage(page); if ( win ) { @@ -399,7 +399,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page) bool wxChoicebook::DeleteAllPages() { m_choice->Clear(); - return wxBookCtrl::DeleteAllPages(); + return wxBookCtrlBase::DeleteAllPages(); } // ----------------------------------------------------------------------------