Add missing WXK constants for the control keys

[wxWidgets.git] / src / common / bookctrl.cpp

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 6ab3784e11574d9f2ba4836ecf323b7b32259c66..9f0e284652550a55169d1529220b9825783bb5ee 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -109,21 +109,17 @@ wxSize wxBookCtrlBase::CalcSizeFromPage(const wxSize& sizePage) const
     if ( !m_bookctrl || !m_bookctrl->IsShown() )
         return sizePage;
 
     if ( !m_bookctrl || !m_bookctrl->IsShown() )
         return sizePage;
 

+    // Notice that the controller size is its current size while we really want
+    // to have its best size. So we only take into account its size in the
+    // direction in which we should add it but not in the other one, where the
+    // controller size is determined by the size of wxBookCtrl itself.

     const wxSize sizeController = GetControllerSize();
 
     wxSize size = sizePage;
     if ( IsVertical() )
     const wxSize sizeController = GetControllerSize();
 
     wxSize size = sizePage;
     if ( IsVertical() )

-    {
-        if ( sizeController.x > sizePage.x )
-            size.x = sizeController.x;

         size.y += sizeController.y + GetInternalBorder();
         size.y += sizeController.y + GetInternalBorder();

-    }

     else // left/right aligned
     else // left/right aligned

-    {

         size.x += sizeController.x + GetInternalBorder();
         size.x += sizeController.x + GetInternalBorder();

-        if ( sizeController.y > sizePage.y )
-            size.y = sizeController.y;
-    }

 
     return size;
 }
 
     return size;
 }