X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61c083e7818114734695cb26aa006098a86e62c3..1a4138c79aca299ccd31ab8248918e7910ea20d3:/src/generic/choicbkg.cpp

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index c40ba14fe4..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"
 
@@ -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,9 @@ wxSize wxChoicebook::GetChoiceSize() const
 
 wxRect wxChoicebook::GetPageRect() const
 {
-    const wxSize sizeChoice = m_choice->GetSize();
+    const wxSize sizeChoice = m_choice->GetBestFittingSize();
 
-    wxPoint pt(0, 0);
+    wxPoint pt;
     wxRect rectPage(pt, GetClientSize());
     switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
     {
@@ -207,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 )
@@ -258,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))