X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/716dc24570f542fd68df9edf5c54e178a7c58bdd..42e53e77719543f722d82274031238754f7e09f7:/src/generic/choicbkg.cpp

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 9c3062d742..db4b2f16ad 100644
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "choicebook.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -64,7 +60,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()
@@ -123,7 +119,7 @@ wxChoicebook::Create(wxWindow *parent,
 wxSize wxChoicebook::GetChoiceSize() const
 {
     const wxSize sizeClient = GetClientSize(),
-                 sizeChoice = m_choice->GetBestSize();
+                 sizeChoice = m_choice->GetBestFittingSize();
 
     wxSize size;
     if ( IsVertical() )
@@ -142,9 +138,10 @@ wxSize wxChoicebook::GetChoiceSize() const
 
 wxRect wxChoicebook::GetPageRect() const
 {
-    const wxSize sizeChoice = m_choice->GetSize();
+    const wxSize sizeChoice = m_choice->GetBestFittingSize();
 
-    wxRect rectPage(wxPoint(0, 0), GetClientSize());
+    wxPoint pt;
+    wxRect rectPage(pt, GetClientSize());
     switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
     {
         default:
@@ -206,8 +203,8 @@ void wxChoicebook::OnSize(wxSizeEvent& event)
             break;
     }
 
-    m_choice->Move(posChoice.x, posChoice.y);
-    m_choice->SetSize(sizeChoice.x, sizeChoice.y);
+    m_choice->Move(posChoice);
+    m_choice->SetSize(sizeChoice);
 
     // resize the currently shown page
     if ( m_selection != wxNOT_FOUND )
@@ -257,7 +254,7 @@ int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const
 {
     wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
@@ -275,7 +272,7 @@ void wxChoicebook::SetImageList(wxImageList *imageList)
 {
     // TODO: can be implemented in form of static bitmap near choice control
 
-    wxBookCtrl::SetImageList(imageList);
+    wxBookCtrlBase::SetImageList(imageList);
 }
 
 // ----------------------------------------------------------------------------
@@ -333,7 +330,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);
@@ -368,7 +365,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 )
     {
@@ -398,7 +395,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page)
 bool wxChoicebook::DeleteAllPages()
 {
     m_choice->Clear();
-    return wxBookCtrl::DeleteAllPages();
+    return wxBookCtrlBase::DeleteAllPages();
 }
 
 // ----------------------------------------------------------------------------