X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ddb4d13585d5235556119fb1937273da9e433a3..3e822cd8d0bdf04cd2c7a3dddff61dcc211f7439:/src/common/bookctrl.cpp

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 2431b05ac5..f22559cb98 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -53,6 +53,7 @@ void wxBookCtrlBase::Init()
     m_bookctrl = NULL;
     m_imageList = NULL;
     m_ownsImageList = false;
+    m_fitToCurrentPage = false;
 
 #if defined(__WXWINCE__)
     m_internalBorder = 1;
@@ -143,6 +144,9 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
                 bestSize.y = childBestSize.y;
         }
     }
+    
+    if (m_fitToCurrentPage && GetCurrentPage())
+        bestSize = GetCurrentPage()->GetBestSize();
 
     // convert display area to window area, adding the size necessary for the
     // tabs
@@ -252,10 +256,9 @@ wxRect wxBookCtrlBase::GetPageRect() const
     return rectPage;
 }
 
-void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+// Lay out controls
+void wxBookCtrlBase::DoSize()
 {
-    event.Skip();
-
     if ( !m_bookctrl )
     {
         // we're not fully created yet or OnSize() should be hidden by derived class
@@ -303,6 +306,13 @@ void wxBookCtrlBase::OnSize(wxSizeEvent& event)
     }
 }
 
+void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+{
+    event.Skip();
+    
+    DoSize();
+}
+
 wxSize wxBookCtrlBase::GetControllerSize() const
 {
     if(!m_bookctrl)