another fix for !USE_PCH: added missing wx/imaglist.h include

[wxWidgets.git] / src / generic / choicbkg.cpp

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 05b057a16f5c1b5acb555e7b90a6a72b670a8ec4..db4b2f16ad2fe93d9ab82bb83f7977cfd276114b 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // 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(),
 wxSize wxChoicebook::GetChoiceSize() const
 {
     const wxSize sizeClient = GetClientSize(),

-                 sizeChoice = m_choice->GetBestSize();
+                 sizeChoice = m_choice->GetBestFittingSize();

 
     wxSize size;
     if ( IsVertical() )
 
     wxSize size;
     if ( IsVertical() )


@@ -142,7 +138,7 @@ wxSize wxChoicebook::GetChoiceSize() const
 
 wxRect wxChoicebook::GetPageRect() const
 {
 
 wxRect wxChoicebook::GetPageRect() const
 {

-    const wxSize sizeChoice = m_choice->GetSize();
+    const wxSize sizeChoice = m_choice->GetBestFittingSize();

 
     wxPoint pt;
     wxRect rectPage(pt, GetClientSize());
 
     wxPoint pt;
     wxRect rectPage(pt, GetClientSize());


@@ -207,8 +203,8 @@ void wxChoicebook::OnSize(wxSizeEvent& event)
             break;
     }
 
             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 )
 
     // 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") );
 
 {
     wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
 

-    return -1;
+    return wxNOT_FOUND;

 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))