Lookup result windows now force the first column size to be no great than 20 characte...

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index a0ee65773c2cb0c7c69578e2a1e10544d6d08cb2..93f988572eb338ac246e4937a3d04889b3d3fa8f 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.cpp
 // Purpose:     provide new wxSizer class for layout
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.cpp
 // Purpose:     provide new wxSizer class for layout

-// Author:      Robert Roebling and Robin Dunn
+// Author:      Robert Roebling and Robin Dunn, contributions by
+//              Dirk Holtwick, Ron Lee

 // Modified by: Ron Lee
 // Created:
 // RCS-ID:      $Id$
 // Modified by: Ron Lee
 // Created:
 // RCS-ID:      $Id$

-// Copyright:   (c) Robin Dunn, Dirk Holtwick and Robert Roebling
-//              (c) 2003, Ron Lee
+// Copyright:   (c) Robin Dunn, Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "sizer.h"
 #endif
 
 #pragma implementation "sizer.h"
 #endif
 


@@ -24,8 +24,14 @@
 #include "wx/sizer.h"
 #include "wx/utils.h"
 #include "wx/statbox.h"
 #include "wx/sizer.h"
 #include "wx/utils.h"
 #include "wx/statbox.h"

-#include "wx/notebook.h"
-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"
+#if WXWIN_COMPATIBILITY_2_4
+    #include "wx/notebook.h"
+#endif
+
+#ifdef __WXMAC__
+#   include "wx/mac/uma.h"
+#endif

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -37,17 +43,64 @@ IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
 #if wxUSE_STATBOX
 IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 #endif
 #if wxUSE_STATBOX
 IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 #endif

-#if wxUSE_NOTEBOOK
-IMPLEMENT_CLASS(wxNotebookSizer, wxSizer)
-#endif

 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 

+/*
+    TODO PROPERTIES
+      sizeritem
+        object
+        object_ref
+          minsize
+          option
+          flag
+          border
+     spacer
+        option
+        flag
+        borfder
+    boxsizer
+       orient
+    staticboxsizer
+       orient
+       label
+    gridsizer
+       rows
+       cols
+       vgap
+       hgap
+    flexgridsizer
+       rows
+       cols
+       vgap
+       hgap
+       growablerows
+       growablecols
+    minsize
+*/

 
 //---------------------------------------------------------------------------
 // wxSizerItem
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 // wxSizerItem
 //---------------------------------------------------------------------------
 

+void wxSizerItem::Init()
+{
+    m_window = NULL;
+    m_sizer = NULL;
+    m_show = true;
+    m_userData = NULL;
+    m_zoneRect = wxRect( 0, 0, 0, 0 );
+}
+
+void wxSizerItem::Init(const wxSizerFlags& flags)
+{
+    Init();
+
+    m_proportion = flags.GetProportion();
+    m_flag = flags.GetFlags();
+    m_border = flags.GetBorderInPixels();
+}
+

 wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int border, wxObject* userData )
     : m_window( NULL )
     , m_sizer( NULL )
 wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int border, wxObject* userData )
     : m_window( NULL )
     , m_sizer( NULL )


@@ -56,6 +109,7 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )

+    , m_zoneRect( 0, 0, 0, 0 )

     , m_show( true )
     , m_userData( userData )
 {
     , m_show( true )
     , m_userData( userData )
 {


@@ -65,13 +119,17 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b
 wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
     : m_window( window )
     , m_sizer( NULL )
 wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
     : m_window( window )
     , m_sizer( NULL )

-    , m_minSize( window->GetSize() )    // minimal size is the initial size

     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )

+    , m_zoneRect( 0, 0, 0, 0 )

     , m_show( true )
     , m_userData( userData )
 {
     , m_show( true )
     , m_userData( userData )
 {

+    if (flag & wxFIXED_MINSIZE)
+        window->SetMinSize(window->GetSize());
+    m_minSize = window->GetSize();
+

     // aspect ratio calculated from initial size
     SetRatio( m_minSize );
 
     // aspect ratio calculated from initial size
     SetRatio( m_minSize );
 


@@ -84,6 +142,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )
     , m_proportion( proportion )
     , m_border( border )
     , m_flag( flag )

+    , m_zoneRect( 0, 0, 0, 0 )

     , m_show( true )
     , m_ratio( 0.0 )
     , m_userData( userData )
     , m_show( true )
     , m_ratio( 0.0 )
     , m_userData( userData )


@@ -92,12 +151,27 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
     // m_size is calculated later
 }
 
     // m_size is calculated later
 }
 

+wxSizerItem::wxSizerItem()
+{
+    Init();
+
+    m_proportion = 0;
+    m_border = 0;
+    m_flag = 0;
+}
+

 wxSizerItem::~wxSizerItem()
 {
 wxSizerItem::~wxSizerItem()
 {

-    if (m_userData)
-        delete m_userData;
-    if (m_sizer)
+    delete m_userData;
+
+    if ( m_window )
+    {
+        m_window->SetContainingSizer(NULL);
+    }
+    else // we must be a sizer
+    {

         delete m_sizer;
         delete m_sizer;

+    }

 }
 
 
 }
 
 


@@ -125,30 +199,29 @@ wxSize wxSizerItem::GetSize() const
 
 wxSize wxSizerItem::CalcMin()
 {
 
 wxSize wxSizerItem::CalcMin()
 {

-    wxSize ret;

     if (IsSizer())
     {
     if (IsSizer())
     {

-        ret = m_sizer->GetMinSize();
+        m_minSize = m_sizer->GetMinSize();

 
         // if we have to preserve aspect ratio _AND_ this is
         // the first-time calculation, consider ret to be initial size
         if ((m_flag & wxSHAPED) && !m_ratio)
 
         // if we have to preserve aspect ratio _AND_ this is
         // the first-time calculation, consider ret to be initial size
         if ((m_flag & wxSHAPED) && !m_ratio)

-            SetRatio(ret);
+            SetRatio(m_minSize);

     }
     }

-    else
+    else if ( IsWindow() )

     {
     {

-        if ( IsWindow() && (m_flag & wxADJUST_MINSIZE) )
-        {
-            // By user request, keep the minimal size for this item
-            // in sync with the largest of BestSize and any user supplied
-            // minimum size hint.  Useful in cases where the item is
-            // changeable -- static text labels, etc.
-            m_minSize = m_window->GetAdjustedBestSize();
-        }
-
-        ret = m_minSize;
+        // Since the size of the window may change during runtime, we
+        // should use the current minimal/best size.
+        m_minSize = m_window->GetBestFittingSize();

     }
 
     }
 

+    return GetMinSizeWithBorder();
+}
+
+wxSize wxSizerItem::GetMinSizeWithBorder() const
+{
+    wxSize ret = m_minSize;
+

     if (m_flag & wxWEST)
         ret.x += m_border;
     if (m_flag & wxEAST)
     if (m_flag & wxWEST)
         ret.x += m_border;
     if (m_flag & wxEAST)


@@ -161,6 +234,7 @@ wxSize wxSizerItem::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

+

 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {
     if (m_flag & wxSHAPED)
 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {
     if (m_flag & wxSHAPED)


@@ -217,6 +291,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 

+    m_zoneRect = wxRect(pos, size);

     if (IsWindow())
         m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
 
     if (IsWindow())
         m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
 


@@ -226,7 +301,10 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 void wxSizerItem::DeleteWindows()
 {
     if (m_window)
 void wxSizerItem::DeleteWindows()
 {
     if (m_window)

+    {

          m_window->Destroy();
          m_window->Destroy();

+         m_window = NULL;
+    }

 
     if (m_sizer)
         m_sizer->DeleteWindows();
 
     if (m_sizer)
         m_sizer->DeleteWindows();


@@ -277,103 +355,21 @@ int wxSizerItem::GetOption() const
 wxSizer::wxSizer()
     : m_minSize( wxSize( 0, 0 ) )
 {
 wxSizer::wxSizer()
     : m_minSize( wxSize( 0, 0 ) )
 {

-    m_children.DeleteContents( true );

 }
 
 wxSizer::~wxSizer()
 {
 }
 
 wxSizer::~wxSizer()
 {

-    Clear();
+    WX_CLEAR_LIST(wxSizerItemList, m_children);

 }
 
 }
 

-void wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
-{
-    m_children.Append( new wxSizerItem( window, proportion, flag, border, userData ) );
-    window->SetContainingSizer( this );
-}
-
-void wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
-{
-    m_children.Append( new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData )
-{
-    m_children.Append( new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Add( wxSizerItem *item )
-{
-    m_children.Append( item );
-
-    if( item->GetWindow() )
-        item->GetWindow()->SetContainingSizer( this );
-}
-
-void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
-{
-    m_children.Insert( new wxSizerItem( window, proportion, flag, border, userData ) );
-    window->SetContainingSizer( this );
-}
-
-void wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
-{
-    m_children.Insert( new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData )
-{
-    m_children.Insert( new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Prepend( wxSizerItem *item )
-{
-    m_children.Insert( item );
-
-    if( item->GetWindow() )
-        item->GetWindow()->SetContainingSizer( this );
-}
-
-void wxSizer::Insert( size_t index,
-                      wxWindow *window,
-                      int proportion,
-                      int flag,
-                      int border,
-                      wxObject* userData )
-{
-    m_children.Insert( index,
-                       new wxSizerItem( window, proportion, flag, border, userData ) );
-    window->SetContainingSizer( this );
-}
-
-void wxSizer::Insert( size_t index,
-                      wxSizer *sizer,
-                      int proportion,
-                      int flag,
-                      int border,
-                      wxObject* userData )
-{
-    m_children.Insert( index,
-                       new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Insert( size_t index,
-                      int width,
-                      int height,
-                      int proportion,
-                      int flag,
-                      int border,
-                      wxObject* userData )
-{
-    m_children.Insert( index,
-                       new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Insert( size_t index, wxSizerItem *item )
+wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )

 {
     m_children.Insert( index, item );
 
     if( item->GetWindow() )
         item->GetWindow()->SetContainingSizer( this );
 {
     m_children.Insert( index, item );
 
     if( item->GetWindow() )
         item->GetWindow()->SetContainingSizer( this );

+
+    return item;

 }
 
 bool wxSizer::Remove( wxWindow *window )
 }
 
 bool wxSizer::Remove( wxWindow *window )


@@ -385,13 +381,17 @@ bool wxSizer::Remove( wxSizer *sizer )
 {
     wxASSERT_MSG( sizer, _T("Removing NULL sizer") );
 
 {
     wxASSERT_MSG( sizer, _T("Removing NULL sizer") );
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->GetSizer() == sizer)
     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->GetSizer() == sizer)

-            return m_children.DeleteNode( node );
+        {
+            delete item;
+            m_children.Erase( node );
+            return true;
+        }

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -405,7 +405,7 @@ bool wxSizer::Remove( int index )
                  false,
                  _T("Remove index is out of range") );
 
                  false,
                  _T("Remove index is out of range") );
 

-    wxSizerItemList::Node *node = m_children.Item( index );
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );

 
     wxCHECK_MSG( node, false, _T("Failed to find child node") );
 
 
     wxCHECK_MSG( node, false, _T("Failed to find child node") );
 


@@ -414,14 +414,16 @@ bool wxSizer::Remove( int index )
     if( item->IsWindow() )
         item->GetWindow()->SetContainingSizer( NULL );
 
     if( item->IsWindow() )
         item->GetWindow()->SetContainingSizer( NULL );
 

-    return m_children.DeleteNode( node );
+    delete item;
+    m_children.Erase( node );
+    return true;

 }
 
 bool wxSizer::Detach( wxSizer *sizer )
 {
     wxASSERT_MSG( sizer, _T("Detaching NULL sizer") );
 
 }
 
 bool wxSizer::Detach( wxSizer *sizer )
 {
     wxASSERT_MSG( sizer, _T("Detaching NULL sizer") );
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -429,7 +431,9 @@ bool wxSizer::Detach( wxSizer *sizer )
         if (item->GetSizer() == sizer)
         {
             item->DetachSizer();
         if (item->GetSizer() == sizer)
         {
             item->DetachSizer();

-            return m_children.DeleteNode( node );
+            delete item;
+            m_children.Erase( node );
+            return true;

         }
         node = node->GetNext();
     }
         }
         node = node->GetNext();
     }


@@ -441,7 +445,7 @@ bool wxSizer::Detach( wxWindow *window )
 {
     wxASSERT_MSG( window, _T("Detaching NULL window") );
 
 {
     wxASSERT_MSG( window, _T("Detaching NULL window") );
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -449,7 +453,9 @@ bool wxSizer::Detach( wxWindow *window )
         if (item->GetWindow() == window)
         {
             item->GetWindow()->SetContainingSizer( NULL );
         if (item->GetWindow() == window)
         {
             item->GetWindow()->SetContainingSizer( NULL );

-            return m_children.DeleteNode( node );
+            delete item;
+            m_children.Erase( node );
+            return true;

         }
         node = node->GetNext();
     }
         }
         node = node->GetNext();
     }


@@ -463,7 +469,7 @@ bool wxSizer::Detach( int index )
                  false,
                  _T("Detach index is out of range") );
 
                  false,
                  _T("Detach index is out of range") );
 

-    wxSizerItemList::Node *node = m_children.Item( index );
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );

 
     wxCHECK_MSG( node, false, _T("Failed to find child node") );
 
 
     wxCHECK_MSG( node, false, _T("Failed to find child node") );
 


@@ -474,13 +480,15 @@ bool wxSizer::Detach( int index )
     else if( item->IsWindow() )
         item->GetWindow()->SetContainingSizer( NULL );
 
     else if( item->IsWindow() )
         item->GetWindow()->SetContainingSizer( NULL );
 

-    return m_children.DeleteNode( node );
+    delete item;
+    m_children.Erase( node );
+    return true;

 }
 
 void wxSizer::Clear( bool delete_windows )
 {
     // First clear the ContainingSizer pointers
 }
 
 void wxSizer::Clear( bool delete_windows )
 {
     // First clear the ContainingSizer pointers

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -495,12 +503,12 @@ void wxSizer::Clear( bool delete_windows )
         DeleteWindows();
 
     // Now empty the list
         DeleteWindows();
 
     // Now empty the list

-    m_children.Clear();
+    WX_CLEAR_LIST(wxSizerItemList, m_children);

 }
 
 void wxSizer::DeleteWindows()
 {
 }
 
 void wxSizer::DeleteWindows()
 {

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -512,11 +520,8 @@ void wxSizer::DeleteWindows()
 
 wxSize wxSizer::Fit( wxWindow *window )
 {
 
 wxSize wxSizer::Fit( wxWindow *window )
 {

-    wxSize size;
-    if (window->IsTopLevel())
-        size = FitSize( window );
-    else
-        size = GetMinWindowSize( window );
+    wxSize size(window->IsTopLevel() ? FitSize(window)
+                                     : GetMinWindowSize(window));

 
     window->SetSize( size );
 
 
     window->SetSize( size );
 


@@ -536,7 +541,11 @@ void wxSizer::FitInside( wxWindow *window )
 
 void wxSizer::Layout()
 {
 
 void wxSizer::Layout()
 {

+    // (re)calculates minimums needed for each item and other preparations
+    // for layout

     CalcMin();
     CalcMin();

+
+    // Applies the layout and repositions/resizes the items

     RecalcSizes();
 }
 
     RecalcSizes();
 }
 


@@ -581,6 +590,10 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window )
                    minSize.y+size.y-client_size.y );
 }
 
                    minSize.y+size.y-client_size.y );
 }
 

+// TODO on mac we need a function that determines how much free space this
+// min size contains, in order to make sure that we have 20 pixels of free
+// space around the controls
+

 // Return a window size that will fit within the screens dimensions
 wxSize wxSizer::FitSize( wxWindow *window )
 {
 // Return a window size that will fit within the screens dimensions
 wxSize wxSizer::FitSize( wxWindow *window )
 {


@@ -589,9 +602,9 @@ wxSize wxSizer::FitSize( wxWindow *window )
 
     // Limit the size if sizeMax != wxDefaultSize
 
 
     // Limit the size if sizeMax != wxDefaultSize
 

-    if ( size.x > sizeMax.x && sizeMax.x != -1 )
+    if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )

         size.x = sizeMax.x;
         size.x = sizeMax.x;

-    if ( size.y > sizeMax.y && sizeMax.y != -1 )
+    if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )

         size.y = sizeMax.y;
 
     return size;
         size.y = sizeMax.y;
 
     return size;


@@ -625,9 +638,9 @@ wxSize wxSizer::VirtualFitSize( wxWindow *window )
 
     // Limit the size if sizeMax != wxDefaultSize
 
 
     // Limit the size if sizeMax != wxDefaultSize
 

-    if ( size.x > sizeMax.x && sizeMax.x != -1 )
+    if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )

         size.x = sizeMax.x;
         size.x = sizeMax.x;

-    if ( size.y > sizeMax.y && sizeMax.y != -1 )
+    if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )

         size.y = sizeMax.y;
 
     return size;
         size.y = sizeMax.y;
 
     return size;


@@ -662,14 +675,14 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 
     // Is it our immediate child?
 
 
     // Is it our immediate child?
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->GetWindow() == window)
         {
     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->GetWindow() == window)
         {

-            item->SetInitSize( width, height );
+            item->SetMinSize( width, height );

             return true;
         }
         node = node->GetNext();
             return true;
         }
         node = node->GetNext();


@@ -700,7 +713,7 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
 
     // Is it our immediate child?
 
 
     // Is it our immediate child?
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -734,7 +747,7 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
 
 bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
 {
 
 bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
 {

-    wxSizerItemList::Node   *node = m_children.Item( index );
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );

 
     wxCHECK_MSG( node, false, _T("Failed to find child node") );
 
 
     wxCHECK_MSG( node, false, _T("Failed to find child node") );
 


@@ -747,60 +760,116 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
     }
     else
     {
     }
     else
     {

-        // ... but the minimal size of spacers and windows in stored in them
-        item->SetInitSize( width, height );
+        // ... but the minimal size of spacers and windows is stored via the item
+        item->SetMinSize( width, height );

     }
 
     return true;
 }
 
     }
 
     return true;
 }
 

-void wxSizer::Show( wxWindow *window, bool show )
+wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )

 {
 {

-    wxASSERT_MSG( window, _T("Show for NULL window") );
+    wxASSERT_MSG( window, _T("GetItem for NULL window") );

 
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->GetWindow() == window)
         {
     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->GetWindow() == window)
         {

-            item->Show( show );
-            break;
+            return item;

         }
         }

+        else if (recursive && item->IsSizer())
+        {
+            wxSizerItem *subitem = item->GetSizer()->GetItem( window, true );
+            if (subitem)
+                return subitem;
+        }
+

         node = node->GetNext();
     }
         node = node->GetNext();
     }

+
+    return NULL;

 }
 
 }
 

-void wxSizer::Show( wxSizer *sizer, bool show )
+wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )

 {
 {

-    wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
+    wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );

 
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxSizerItem     *item = node->GetData();
+        wxSizerItem *item = node->GetData();

 
         if (item->GetSizer() == sizer)
         {
 
         if (item->GetSizer() == sizer)
         {

-            item->Show( show );
-            break;
+            return item;
+        }
+        else if (recursive && item->IsSizer())
+        {
+            wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true );
+            if (subitem)
+                return subitem;

         }
         }

+

         node = node->GetNext();
     }
         node = node->GetNext();
     }

+
+    return NULL;
+}
+
+wxSizerItem* wxSizer::GetItem( size_t index )
+{
+    wxCHECK_MSG( index < m_children.GetCount(),
+                 NULL,
+                 _T("GetItem index is out of range") );
+
+    return m_children.Item( index )->GetData();
+}
+
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
+{
+    wxSizerItem *item = GetItem( window, recursive );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }
+
+    return false;
+}
+
+bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
+{
+    wxSizerItem *item = GetItem( sizer, recursive );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }
+
+    return false;

 }
 
 }
 

-void wxSizer::Show( size_t index, bool show )
+bool wxSizer::Show( size_t index, bool show)

 {
 {

-    wxCHECK_RET( index < m_children.GetCount(),
-                 _T("Show index is out of range") );
+    wxSizerItem *item = GetItem( index );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }

 
 

-    m_children.Item( index )->GetData()->Show( show );
+    return false;

 }
 
 void wxSizer::ShowItems( bool show )
 {
 }
 
 void wxSizer::ShowItems( bool show )
 {

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         node->GetData()->Show( show );
     while (node)
     {
         node->GetData()->Show( show );


@@ -810,7 +879,7 @@ void wxSizer::ShowItems( bool show )
 
 bool wxSizer::IsShown( wxWindow *window ) const
 {
 
 bool wxSizer::IsShown( wxWindow *window ) const
 {

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -829,7 +898,7 @@ bool wxSizer::IsShown( wxWindow *window ) const
 
 bool wxSizer::IsShown( wxSizer *sizer ) const
 {
 
 bool wxSizer::IsShown( wxSizer *sizer ) const
 {

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -866,6 +935,8 @@ wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
     , m_vgap( vgap )
     , m_hgap( hgap )
 {
     , m_vgap( vgap )
     , m_hgap( hgap )
 {

+    if (m_rows == 0 && m_cols == 0)
+        m_rows = 1;

 }
 
 wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
 }
 
 wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )


@@ -874,6 +945,8 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
     , m_vgap( vgap )
     , m_hgap( hgap )
 {
     , m_vgap( vgap )
     , m_hgap( hgap )
 {

+    if (m_rows == 0 && m_cols == 0)
+        m_rows = 1;

 }
 
 int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
 }
 
 int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const


@@ -923,7 +996,7 @@ void wxGridSizer::RecalcSizes()
             int i = r * ncols + c;
             if (i < nitems)
             {
             int i = r * ncols + c;
             if (i < nitems)
             {

-                wxSizerItemList::Node   *node = m_children.Item( i );
+                wxSizerItemList::compatibility_iterator node = m_children.Item( i );

 
                 wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );
 
 
                 wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );
 


@@ -937,15 +1010,15 @@ void wxGridSizer::RecalcSizes()
 
 wxSize wxGridSizer::CalcMin()
 {
 
 wxSize wxGridSizer::CalcMin()
 {

-    int nitems, nrows, ncols;
-    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+    int nrows, ncols;
+    if ( CalcRowsCols(nrows, ncols) == 0 )

         return wxSize(10, 10);
 
     // Find the max width and height for any component
     int w = 0;
     int h = 0;
 
         return wxSize(10, 10);
 
     // Find the max width and height for any component
     int w = 0;
     int h = 0;
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
     while (node)
     {
         wxSizerItem     *item = node->GetData();


@@ -964,7 +1037,7 @@ wxSize wxGridSizer::CalcMin()
 void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
 {
     wxPoint pt( x,y );
 void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
 {
     wxPoint pt( x,y );

-    wxSize sz( item->CalcMin() );
+    wxSize sz( item->GetMinSizeWithBorder() );

     int flag = item->GetFlag();
 
     if ((flag & wxEXPAND) || (flag & wxSHAPED))
     int flag = item->GetFlag();
 
     if ((flag & wxEXPAND) || (flag & wxSHAPED))


@@ -1023,68 +1096,10 @@ void wxFlexGridSizer::RecalcSizes()
     if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
         return;
 
     if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
         return;
 

-    wxSize sz( GetSize() );
-    wxSize minsz( CalcMin() );

     wxPoint pt( GetPosition() );
     wxPoint pt( GetPosition() );

-    int    delta;
-    size_t idx, num;
-    wxArrayInt temp;
-
-    // what to do with the rows? by default, resize them proportionally
-    if ( (m_flexDirection & wxVERTICAL) ||
-            (m_growMode == wxFLEX_GROWMODE_SPECIFIED) )
-    {
-        // Transfer only those rows into temp which exist in the sizer
-        // ignoring the superfluous ones. This prevents a segfault when
-        // calling AddGrowableRow( 3 ) if the sizer only has 2 rows.
-        for (idx = 0; idx < m_growableRows.GetCount(); idx++)
-        {
-            if (m_growableRows[idx] < nrows)
-                temp.Add( m_growableRows[idx] );
-        }
-
-        num = temp.GetCount();
-
-        if ((num > 0) && (sz.y > minsz.y))
-        {
-            delta = (sz.y - minsz.y) / num;
-            for (idx = 0; idx < num; idx++)
-                m_rowHeights[ temp[idx] ] += delta;
-        }
-        temp.Empty();
-    }
-    else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) )
-    {
-        // rounding problem?
-        for ( int row = 0; row < nrows; ++row )
-            m_rowHeights[ row ] = sz.y / nrows;
-    }
-
-    // the same logic as above but for the columns
-    if ( (m_flexDirection & wxHORIZONTAL) ||
-            (m_growMode == wxFLEX_GROWMODE_SPECIFIED) )
-    {
-        // See above
-        for (idx = 0; idx < m_growableCols.GetCount(); idx++)
-        {
-            if (m_growableCols[idx] < ncols)
-                temp.Add( m_growableCols[idx] );
-        }
-
-        num = temp.GetCount();
+    wxSize sz( GetSize() );

 
 

-        if ((num > 0) && (sz.x > minsz.x))
-        {
-            delta = (sz.x - minsz.x) / num;
-            for (idx = 0; idx < num; idx++)
-                m_colWidths[ temp[idx] ] += delta;
-        }
-    }
-    else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
-    {
-        for ( int col=0; col < ncols; ++col )
-            m_colWidths[ col ] = sz.x / ncols;
-    }
+    AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);

 
     sz = wxSize( pt.x + sz.x, pt.y + sz.y );
 
 
     sz = wxSize( pt.x + sz.x, pt.y + sz.y );
 


@@ -1097,7 +1112,7 @@ void wxFlexGridSizer::RecalcSizes()
             int i = r * ncols + c;
             if (i < nitems)
             {
             int i = r * ncols + c;
             if (i < nitems)
             {

-                wxSizerItemList::Node   *node = m_children.Item( i );
+                wxSizerItemList::compatibility_iterator node = m_children.Item( i );

 
                 wxASSERT_MSG( node, _T("Failed to find node") );
 
 
                 wxASSERT_MSG( node, _T("Failed to find node") );
 


@@ -1114,32 +1129,69 @@ void wxFlexGridSizer::RecalcSizes()
 
 wxSize wxFlexGridSizer::CalcMin()
 {
 
 wxSize wxFlexGridSizer::CalcMin()
 {

-    int nrows, ncols;
+    int     nrows,
+            ncols;
+    size_t  i, s;
+
+    // Number of rows/columns can change as items are added or removed.

     if ( !CalcRowsCols(nrows, ncols) )
         return wxSize(10, 10);
 
     m_rowHeights.SetCount(nrows);
     m_colWidths.SetCount(ncols);
 
     if ( !CalcRowsCols(nrows, ncols) )
         return wxSize(10, 10);
 
     m_rowHeights.SetCount(nrows);
     m_colWidths.SetCount(ncols);
 

-    int                      i = 0;
-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    // We have to recalcuate the sizes in case the item minimum size has
+    // changed since the previous layout, or the item has been hidden using
+    // wxSizer::Show(). If all the items in a row/column are hidden, the final
+    // dimension of the row/column will be -1, indicating that the column
+    // itself is hidden.
+    for( s = m_rowHeights.GetCount(), i = 0; i < s; ++i )
+        m_rowHeights[ i ] = -1;
+    for( s = m_colWidths.GetCount(), i = 0; i < s; ++i )
+        m_colWidths[ i ] = -1;
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

 
 

+    i = 0;

     while (node)
     {
         wxSizerItem    *item = node->GetData();
     while (node)
     {
         wxSizerItem    *item = node->GetData();

-        wxSize          sz( item->CalcMin() );
-        int             row = i / ncols;
-        int             col = i % ncols;
+        if ( item->IsShown() )
+        {
+            wxSize sz( item->CalcMin() );
+            int row = i / ncols;
+            int col = i % ncols;

 
 

-        m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] );
-        m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] );
+            m_rowHeights[ row ] = wxMax( wxMax( 0, sz.y ), m_rowHeights[ row ] );
+            m_colWidths[ col ] = wxMax( wxMax( 0, sz.x ), m_colWidths[ col ] );
+        }

 
         node = node->GetNext();
         i++;
     }
 
 
         node = node->GetNext();
         i++;
     }
 

-    // the logic above works when we resize flexibly in both directions but
-    // maybe this is not the case
+    AdjustForFlexDirection();
+
+    // Sum total minimum size, including gaps between rows/columns.
+    // -1 is used as a magic number meaning empty column.
+    int width = 0;
+    for (int col = 0; col < ncols; col++)
+        if ( m_colWidths[ col ] != -1 )
+            width += m_colWidths[ col ] + ( col == ncols-1 ? 0 : m_hgap );
+
+    int height = 0;
+    for (int row = 0; row < nrows; row++)
+        if ( m_rowHeights[ row ] != -1 )
+            height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
+
+    m_calculatedMinSize = wxSize( width, height );
+    return m_calculatedMinSize;
+}
+
+void wxFlexGridSizer::AdjustForFlexDirection()
+{
+    // the logic in CalcMin works when we resize flexibly in both directions
+    // but maybe this is not the case

     if ( m_flexDirection != wxBOTH )
     {
         // select the array corresponding to the direction in which we do *not*
     if ( m_flexDirection != wxBOTH )
     {
         // select the array corresponding to the direction in which we do *not*


@@ -1150,8 +1202,7 @@ wxSize wxFlexGridSizer::CalcMin()
         const int count = array.GetCount();
 
         // find the largest value in this array
         const int count = array.GetCount();
 
         // find the largest value in this array

-        int n,
-            largest = 0;
+        int n, largest = 0;

         for ( n = 0; n < count; ++n )
         {
             if ( array[n] > largest )
         for ( n = 0; n < count; ++n )
         {
             if ( array[n] > largest )


@@ -1164,36 +1215,137 @@ wxSize wxFlexGridSizer::CalcMin()
             array[n] = largest;
         }
     }
             array[n] = largest;
         }
     }

+}

 
 
 
 

-    int width = 0;
-    for (int col = 0; col < ncols; col++)
-        width += m_colWidths[ col ];
+void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
+                                         int nrows, int ncols)
+{
+    // what to do with the rows? by default, resize them proportionally
+    if ( sz.y > minsz.y && ( (m_flexDirection & wxVERTICAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+    {
+        int sum_proportions = 0;
+        int growable_space = 0;
+        int num = 0;
+        size_t idx;
+        for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+        {
+            // Since the number of rows/columns can change as items are
+            // inserted/deleted, we need to verify at runtime that the
+            // requested growable rows/columns are still valid.
+            if (m_growableRows[idx] >= nrows)
+                continue;
+
+            // If all items in a row/column are hidden, that row/column will
+            // have a dimension of -1.  This causes the row/column to be
+            // hidden completely.
+            if (m_rowHeights[ m_growableRows[idx] ] == -1)
+                continue;
+            sum_proportions += m_growableRowsProportions[idx];
+            growable_space += m_rowHeights[ m_growableRows[idx] ];
+            num++;
+        }

 
 

-    int height = 0;
-    for (int row = 0; row < nrows; row++)
-        height += m_rowHeights[ row ];
+        if (num > 0)
+        {
+            for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+            {
+                if (m_growableRows[idx] >= nrows )
+                    continue;
+                if (m_rowHeights[ m_growableRows[idx] ] == -1)
+                    m_rowHeights[ m_growableRows[idx] ] = 0;
+                else
+                {
+                    int delta = (sz.y - minsz.y);
+                    if (sum_proportions == 0)
+                        delta = (delta/num) + m_rowHeights[ m_growableRows[idx] ];
+                    else
+                        delta = ((delta+growable_space)*m_growableRowsProportions[idx]) / sum_proportions;
+                    m_rowHeights[ m_growableRows[idx] ] = delta;
+                }
+            }
+        }
+    }
+    else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) )
+    {
+        // rounding problem?
+        for ( int row = 0; row < nrows; ++row )
+            m_rowHeights[ row ] = sz.y / nrows;
+    }
+
+    // the same logic as above but for the columns
+    if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+    {
+        int sum_proportions = 0;
+        int growable_space = 0;
+        int num = 0;
+        size_t idx;
+        for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+        {
+            // Since the number of rows/columns can change as items are
+            // inserted/deleted, we need to verify at runtime that the
+            // requested growable rows/columns are still valid.
+            if (m_growableCols[idx] >= ncols)
+                continue;
+
+            // If all items in a row/column are hidden, that row/column will
+            // have a dimension of -1.  This causes the column to be hidden
+            // completely.
+            if (m_colWidths[ m_growableCols[idx] ] == -1)
+                continue;
+            sum_proportions += m_growableColsProportions[idx];
+            growable_space += m_colWidths[ m_growableCols[idx] ];
+            num++;
+        }

 
 

-    return wxSize( width +  (ncols-1) * m_hgap,
-                   height + (nrows-1) * m_vgap);
+        if (num > 0)
+        {
+            for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+            {
+                if (m_growableCols[idx] >= ncols )
+                    continue;
+                if (m_colWidths[ m_growableCols[idx] ] == -1)
+                    m_colWidths[ m_growableCols[idx] ] = 0;
+                else
+                {
+                    int delta = (sz.x - minsz.x);
+                    if (sum_proportions == 0)
+                        delta = (delta/num) + m_colWidths[ m_growableCols[idx] ];
+                    else
+                        delta = ((delta+growable_space)*m_growableColsProportions[idx])/sum_proportions;
+                    m_colWidths[ m_growableCols[idx] ] = delta;
+                }
+            }
+        }
+    }
+    else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
+    {
+        for ( int col=0; col < ncols; ++col )
+            m_colWidths[ col ] = sz.x / ncols;
+    }

 }
 
 }
 

-void wxFlexGridSizer::AddGrowableRow( size_t idx )
+
+void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )

 {
     m_growableRows.Add( idx );
 {
     m_growableRows.Add( idx );

+    m_growableRowsProportions.Add( proportion );

 }
 
 }
 

-void wxFlexGridSizer::RemoveGrowableRow( size_t WXUNUSED(idx) )
+void wxFlexGridSizer::RemoveGrowableRow( size_t idx )

 {
 {

+    m_growableRows.Remove( idx );

 }
 
 }
 

-void wxFlexGridSizer::AddGrowableCol( size_t idx )
+void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )

 {
     m_growableCols.Add( idx );
 {
     m_growableCols.Add( idx );

+    m_growableColsProportions.Add( proportion );

 }
 
 }
 

-void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) )
+void wxFlexGridSizer::RemoveGrowableCol( size_t idx )

 {
 {

+    m_growableCols.Remove( idx );

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -1211,47 +1363,37 @@ void wxBoxSizer::RecalcSizes()
         return;
 
     int delta = 0;
         return;
 
     int delta = 0;

-    int extra = 0;

     if (m_stretchable)
     {
         if (m_orient == wxHORIZONTAL)
     if (m_stretchable)
     {
         if (m_orient == wxHORIZONTAL)

-        {
-            delta = (m_size.x - m_fixedWidth) / m_stretchable;
-            extra = (m_size.x - m_fixedWidth) % m_stretchable;
-        }
+            delta = m_size.x - m_fixedWidth;

         else
         else

-        {
-            delta = (m_size.y - m_fixedHeight) / m_stretchable;
-            extra = (m_size.y - m_fixedHeight) % m_stretchable;
-        }
+            delta = m_size.y - m_fixedHeight;

     }
 
     wxPoint pt( m_position );
 
     }
 
     wxPoint pt( m_position );
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->IsShown())
         {
     while (node)
     {
         wxSizerItem     *item = node->GetData();
 
         if (item->IsShown())
         {

-            int weight = 1;
-            if (item->GetProportion())
-                weight = item->GetProportion();
-
-            wxSize size( item->CalcMin() );
+            wxSize size( item->GetMinSizeWithBorder() );

 
             if (m_orient == wxVERTICAL)
             {
                 wxCoord height = size.y;
                 if (item->GetProportion())
                 {
 
             if (m_orient == wxVERTICAL)
             {
                 wxCoord height = size.y;
                 if (item->GetProportion())
                 {

-                    height = (delta * weight) + extra;
-                    extra = 0; // only the first item will get the remainder as extra size
+                    // Because of at least one visible item has non-zero
+                    // proportion then m_stretchable is not zero
+                    height = (delta * item->GetProportion()) / m_stretchable;

                 }
 
                 wxPoint child_pos( pt );
                 }
 
                 wxPoint child_pos( pt );

-                wxSize  child_size( wxSize( size.x, height) );
+                wxSize  child_size( size.x, height );

 
                 if (item->GetFlag() & (wxEXPAND | wxSHAPED))
                     child_size.x = m_size.x;
 
                 if (item->GetFlag() & (wxEXPAND | wxSHAPED))
                     child_size.x = m_size.x;


@@ -1271,12 +1413,13 @@ void wxBoxSizer::RecalcSizes()
                 wxCoord width = size.x;
                 if (item->GetProportion())
                 {
                 wxCoord width = size.x;
                 if (item->GetProportion())
                 {

-                    width = (delta * weight) + extra;
-                    extra = 0; // only the first item will get the remainder as extra size
+                    // Because of at least one visible item has non-zero
+                    // proportion then m_stretchable is not zero
+                    width = (delta * item->GetProportion()) / m_stretchable;

                 }
 
                 wxPoint child_pos( pt );
                 }
 
                 wxPoint child_pos( pt );

-                wxSize  child_size( wxSize(width, size.y) );
+                wxSize  child_size( width, size.y );

 
                 if (item->GetFlag() & (wxEXPAND | wxSHAPED))
                     child_size.y = m_size.y;
 
                 if (item->GetFlag() & (wxEXPAND | wxSHAPED))
                     child_size.y = m_size.y;


@@ -1308,26 +1451,45 @@ wxSize wxBoxSizer::CalcMin()
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 

-    // Find how long each stretch unit needs to be
-    int                      stretchSize = 1;
-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    // precalc item minsizes and count proportions
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = node->GetData();
+
+        if (item->IsShown())
+            item->CalcMin();  // result is stored in the item

 
 

+        if (item->IsShown() && item->GetProportion() != 0)
+            m_stretchable += item->GetProportion();
+
+        node = node->GetNext();
+    }
+
+    // Total minimum size (width or height) of sizer
+    int maxMinSize = 0;
+
+    node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxSizerItem     *item = node->GetData();
+        wxSizerItem *item = node->GetData();

 
         if (item->IsShown() && item->GetProportion() != 0)
         {
             int stretch = item->GetProportion();
 
         if (item->IsShown() && item->GetProportion() != 0)
         {
             int stretch = item->GetProportion();

-            wxSize size( item->CalcMin() );
-            int sizePerStretch;
+            wxSize size( item->GetMinSizeWithBorder() );
+            int minSize;
+

             // Integer division rounded up is (a + b - 1) / b
             // Integer division rounded up is (a + b - 1) / b

+            // Round up needed in order to guarantee that all
+            // all items will have size not less then their min size

             if (m_orient == wxHORIZONTAL)
             if (m_orient == wxHORIZONTAL)

-                sizePerStretch = ( size.x + stretch - 1 ) / stretch;
+                minSize = ( size.x*m_stretchable + stretch - 1)/stretch;

             else
             else

-                sizePerStretch = ( size.y + stretch - 1 ) / stretch;
-            if (sizePerStretch > stretchSize)
-                stretchSize = sizePerStretch;
+                minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
+
+            if (minSize > maxMinSize)
+                maxMinSize = minSize;

         }
         node = node->GetNext();
     }
         }
         node = node->GetNext();
     }


@@ -1336,33 +1498,19 @@ wxSize wxBoxSizer::CalcMin()
     node = m_children.GetFirst();
     while (node)
     {
     node = m_children.GetFirst();
     while (node)
     {

-        wxSizerItem     *item = node->GetData();
+        wxSizerItem *item = node->GetData();

 
         if (item->IsShown())
         {
 
         if (item->IsShown())
         {

-            m_stretchable += item->GetProportion();
-
-            wxSize size( item->CalcMin() );
+            wxSize size( item->GetMinSizeWithBorder() );

             if (item->GetProportion() != 0)
             {
                 if (m_orient == wxHORIZONTAL)
             if (item->GetProportion() != 0)
             {
                 if (m_orient == wxHORIZONTAL)

-                    size.x = stretchSize * item->GetProportion();
+                    size.x = (maxMinSize*item->GetProportion())/m_stretchable;

                 else
                 else

-                    size.y = stretchSize * item->GetProportion();
-            }
-
-            if (m_orient == wxHORIZONTAL)
-            {
-                m_minWidth += size.x;
-                m_minHeight = wxMax( m_minHeight, size.y );
+                    size.y = (maxMinSize*item->GetProportion())/m_stretchable;

             }
             else
             }
             else

-            {
-                m_minHeight += size.y;
-                m_minWidth = wxMax( m_minWidth, size.x );
-            }
-
-            if (item->GetProportion() == 0)

             {
                 if (m_orient == wxVERTICAL)
                 {
             {
                 if (m_orient == wxVERTICAL)
                 {


@@ -1375,6 +1523,17 @@ wxSize wxBoxSizer::CalcMin()
                     m_fixedHeight = wxMax( m_fixedHeight, size.y );
                 }
             }
                     m_fixedHeight = wxMax( m_fixedHeight, size.y );
                 }
             }

+
+            if (m_orient == wxHORIZONTAL)
+            {
+                m_minWidth += size.x;
+                m_minHeight = wxMax( m_minHeight, size.y );
+            }
+            else
+            {
+                m_minHeight += size.y;
+                m_minWidth = wxMax( m_minWidth, size.x );
+            }

         }
         node = node->GetNext();
     }
         }
         node = node->GetNext();
     }


@@ -1401,14 +1560,43 @@ static void GetStaticBoxBorders( wxStaticBox *box,
 {
     // this has to be done platform by platform as there is no way to
     // guess the thickness of a wxStaticBox border
 {
     // this has to be done platform by platform as there is no way to
     // guess the thickness of a wxStaticBox border

+#ifdef __WXCOCOA__
+    box->GetBordersForSizer(borderTop,borderOther);
+#elif defined(__WXMAC__)
+
+    static int extraTop = -1; // Uninitted
+    static int other = 5;
+
+    if ( extraTop == -1 )
+    {
+        // The minimal border used for the top. Later on the staticbox'
+        // font height is added to this.
+        extraTop = 0;
+
+        if ( UMAGetSystemVersion() >= 0x1030 /*Panther*/ )
+        {
+            // As indicated by the HIG, Panther needs an extra border of 11
+            // pixels (otherwise overlapping occurs at the top). The "other"
+            // border has to be 11.
+            extraTop = 11;
+            other = 11;
+        }
+
+    }
+
+    *borderTop = extraTop + box->GetCharHeight();
+    *borderOther = other;
+
+#else

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-    if ( box->GetLabel().IsEmpty() )
+    if ( box->GetLabel().empty() )

         *borderTop = 5;
     else
 #endif // __WXGTK__
         *borderTop = 5;
     else
 #endif // __WXGTK__

-        *borderTop = 15;
-    (void)box;
+        *borderTop = box->GetCharHeight();
+

     *borderOther = 5;
     *borderOther = 5;

+#endif // __WXCOCOA__

 }
 
 void wxStaticBoxSizer::RecalcSizes()
 }
 
 void wxStaticBoxSizer::RecalcSizes()


@@ -1443,33 +1631,49 @@ wxSize wxStaticBoxSizer::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

+void wxStaticBoxSizer::ShowItems( bool show )
+{
+    m_staticBox->Show( show );
+    wxBoxSizer::ShowItems( show );
+}
+

 #endif // wxUSE_STATBOX
 
 #endif // wxUSE_STATBOX
 

-//---------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------

 // wxNotebookSizer
 // wxNotebookSizer

-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

+#if wxUSE_BOOKCTRL
+IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)

 #if wxUSE_NOTEBOOK
 #if wxUSE_NOTEBOOK

+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
+
+#if wxUSE_BOOKCTRL

 
 

-wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
-    : m_notebook( nb )
+wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl)
+               : m_bookctrl(bookctrl)

 {
 {

-    wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
+    wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );

 }
 
 }
 

-void wxNotebookSizer::RecalcSizes()
+void wxBookCtrlSizer::RecalcSizes()

 {
 {

-    m_notebook->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
+    m_bookctrl->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );

 }
 
 }
 

-wxSize wxNotebookSizer::CalcMin()
+wxSize wxBookCtrlSizer::CalcMin()

 {
 {

-    wxSize sizeBorder = m_notebook->CalcSizeFromPage(wxSize(0, 0));
+    wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0, 0));

 
     sizeBorder.x += 5;
     sizeBorder.y += 5;
 
 
     sizeBorder.x += 5;
     sizeBorder.y += 5;
 

-    if (m_notebook->GetChildren().GetCount() == 0)
+    if ( m_bookctrl->GetPageCount() == 0 )

     {
         return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
     }
     {
         return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
     }


@@ -1477,7 +1681,8 @@ wxSize wxNotebookSizer::CalcMin()
     int maxX = 0;
     int maxY = 0;
 
     int maxX = 0;
     int maxY = 0;
 

-    wxWindowList::Node *node = m_notebook->GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator
+        node = m_bookctrl->GetChildren().GetFirst();

     while (node)
     {
         wxWindow *item = node->GetData();
     while (node)
     {
         wxWindow *item = node->GetData();


@@ -1499,6 +1704,15 @@ wxSize wxNotebookSizer::CalcMin()
     return wxSize( maxX, maxY ) + sizeBorder;
 }
 
     return wxSize( maxX, maxY ) + sizeBorder;
 }
 

-#endif // wxUSE_NOTEBOOK
+#if wxUSE_NOTEBOOK
+
+wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
+{
+    wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+    m_bookctrl = nb;
+}
+
+#endif // wxUSE_NOTEBOOOK
+#endif // wxUSE_BOOKCTRL

 
 

-// vi:sts=4:sw=4:et
+#endif // WXWIN_COMPATIBILITY_2_4