Make radiobutton tab behaviour the same on MSW

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 049760f8c2db8b157a45ba0547208fa12ccb23c6..475867e17b734abb37d4d022441df79b9869d0cc 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1,15 +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
-// Modified by:
+// Author:      Robert Roebling and Robin Dunn, contributions by
+//              Dirk Holtwick, Ron Lee
+// Modified by: Ron Lee

 // Created:
 // RCS-ID:      $Id$
 // Created:
 // RCS-ID:      $Id$

-// Copyright:   (c) Robin Dunn, Dirk Holtwick and Robert Roebling
+// 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
 


@@ -23,89 +24,154 @@
 #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"
+#if WXWIN_COMPATIBILITY_2_4
+    #include "wx/notebook.h"
+#endif
+
+#ifdef __WXMAC__
+#   include "wx/mac/uma.h"
+#endif

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

-IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject);
-IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
-IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
-IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
-#if wxUSE_NOTEBOOK
-IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer);
+IMPLEMENT_CLASS(wxSizerItem, wxObject)
+IMPLEMENT_CLASS(wxSizer, wxObject)
+IMPLEMENT_CLASS(wxGridSizer, wxSizer)
+IMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer)
+IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
+#if wxUSE_STATBOX
+IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)

 #endif
 
 #endif
 

+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
 //---------------------------------------------------------------------------
 

-wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData )
+void wxSizerItem::Init()

 {
 {

-    m_window = (wxWindow *) NULL;
-    m_sizer = (wxSizer *) NULL;
-    m_option = option;
-    m_border = border;
-    m_flag = flag;
-    m_userData = userData;
-
-    // minimal size is the initial size
-    m_minSize.x = width;
-    m_minSize.y = height;
+    m_window = NULL;
+    m_sizer = NULL;
+    m_show = true;
+    m_userData = NULL;
+}

 
 

-    SetRatio(width, height);
+void wxSizerItem::Init(const wxSizerFlags& flags)
+{
+    Init();

 
 

-    // size is set directly
-    m_size = m_minSize;
+    m_proportion = flags.GetProportion();
+    m_flag = flags.GetFlags();
+    m_border = flags.GetBorderInPixels();

 }
 
 }
 

-wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData )
+wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int border, wxObject* userData )
+    : m_window( NULL )
+    , m_sizer( NULL )
+    , m_size( wxSize( width, height ) ) // size is set directly
+    , m_minSize( m_size )               // minimal size is the initial size
+    , m_proportion( proportion )
+    , m_border( border )
+    , m_flag( flag )
+    , m_show( true )
+    , m_userData( userData )

 {
 {

-    m_window = window;
-    m_sizer = (wxSizer *) NULL;
-    m_option = option;
-    m_border = border;
-    m_flag = flag;
-    m_userData = userData;
+    SetRatio( m_size );
+}

 
 

-    // minimal size is the initial size
+wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
+    : m_window( window )
+    , m_sizer( NULL )
+    , m_proportion( proportion )
+    , m_border( border )
+    , m_flag( flag )
+    , m_show( true )
+    , m_userData( userData )
+{
+    if (flag & wxFIXED_MINSIZE)
+        window->SetMinSize(window->GetSize());

     m_minSize = window->GetSize();
 
     // aspect ratio calculated from initial size
     m_minSize = window->GetSize();
 
     // aspect ratio calculated from initial size

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

 
 

-    // size is calculated later
-    // m_size = ...
+    // m_size is calculated later

 }
 
 }
 

-wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
+    : m_window( NULL )
+    , m_sizer( sizer )
+    , m_proportion( proportion )
+    , m_border( border )
+    , m_flag( flag )
+    , m_show( true )
+    , m_ratio( 0.0 )
+    , m_userData( userData )

 {
 {

-    m_window = (wxWindow *) NULL;
-    m_sizer = sizer;
-    m_option = option;
-    m_border = border;
-    m_flag = flag;
-    m_userData = userData;
+    // m_minSize is calculated later
+    // m_size is calculated later
+}

 
 

-    // minimal size is calculated later
-    // m_minSize = ...
-    m_ratio = 0;
+wxSizerItem::wxSizerItem()
+{
+    Init();

 
 

-    // size is calculated later
-    // m_size = ...
+    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;

+    }

 }
 
 
 }
 
 

-wxSize wxSizerItem::GetSize()
+wxSize wxSizerItem::GetSize() const

 {
     wxSize ret;
     if (IsSizer())
 {
     wxSize ret;
     if (IsSizer())


@@ -129,33 +195,29 @@ wxSize wxSizerItem::GetSize()
 
 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) )
-        {
-            // check if the best (minimal, in fact) window size hadn't changed
-            // by chance: this may happen for, e.g. static text if its label
-            // changed
-            wxSize size = m_window->GetBestSize();
-            if ( size.x > m_minSize.x )
-                m_minSize.x = size.x;
-            if ( size.y > m_minSize.y )
-                m_minSize.y = size.y;
-        }
-
-        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)


@@ -168,6 +230,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)


@@ -230,184 +293,347 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
     m_size = size;
 }
 
     m_size = size;
 }
 

-bool wxSizerItem::IsWindow()
+void wxSizerItem::DeleteWindows()
+{
+    if (m_window)
+    {
+         m_window->Destroy();
+         m_window = NULL;
+    }
+
+    if (m_sizer)
+        m_sizer->DeleteWindows();
+}
+
+bool wxSizerItem::IsWindow() const

 {
     return (m_window != NULL);
 }
 
 {
     return (m_window != NULL);
 }
 

-bool wxSizerItem::IsSizer()
+bool wxSizerItem::IsSizer() const

 {
     return (m_sizer != NULL);
 }
 
 {
     return (m_sizer != NULL);
 }
 

-bool wxSizerItem::IsSpacer()
+bool wxSizerItem::IsSpacer() const

 {
     return (m_window == NULL) && (m_sizer == NULL);
 }
 
 {
     return (m_window == NULL) && (m_sizer == NULL);
 }
 

-//---------------------------------------------------------------------------
-// wxSizer
-//---------------------------------------------------------------------------
-
-wxSizer::wxSizer()
+void wxSizerItem::Show( bool show )

 {
 {

-    m_children.DeleteContents( TRUE );
-    m_minSize.x = 0;
-    m_minSize.y = 0;
-}
+    m_show = show;

 
 

-wxSizer::~wxSizer()
-{
+    if( IsWindow() )
+        m_window->Show( show );
+    else if( IsSizer() )
+        m_sizer->ShowItems( show );
+
+    // ... nothing else to do to hide/show spacers

 }
 
 }
 

-void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData )
+void wxSizerItem::SetOption( int option )

 {
 {

-    m_children.Append( new wxSizerItem( window, option, flag, border, userData ) );
+    SetProportion( option );

 }
 
 }
 

-void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+int wxSizerItem::GetOption() const

 {
 {

-    m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) );
+    return GetProportion();

 }
 
 }
 

-void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData )
+
+//---------------------------------------------------------------------------
+// wxSizer
+//---------------------------------------------------------------------------
+
+wxSizer::wxSizer()
+    : m_minSize( wxSize( 0, 0 ) )

 {
 {

-    m_children.Append( new wxSizerItem( width, height, option, flag, border, userData ) );

 }
 
 }
 

-void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData )
+wxSizer::~wxSizer()

 {
 {

-    m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) );
+    WX_CLEAR_LIST(wxSizerItemList, m_children);

 }
 
 }
 

-void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+void wxSizer::Insert( size_t index, wxSizerItem *item )

 {
 {

-    m_children.Insert( new wxSizerItem( sizer, option, flag, border, userData ) );
+    m_children.Insert( index, item );
+
+    if( item->GetWindow() )
+        item->GetWindow()->SetContainingSizer( this );

 }
 
 }
 

-void wxSizer::Prepend( int width, int height, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Remove( wxWindow *window )

 {
 {

-    m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) );
+    return Detach( window );

 }
 
 }
 

-void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Remove( wxSizer *sizer )

 {
 {

-    m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) );
+    wxASSERT_MSG( sizer, _T("Removing NULL sizer") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            delete item;
+            m_children.Erase( node );
+            return true;
+        }
+
+        node = node->GetNext();
+    }
+
+    return false;

 }
 
 }
 

-void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Remove( int index )

 {
 {

-    m_children.Insert( before, new wxSizerItem( sizer, option, flag, border, userData ) );
+    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
+                 false,
+                 _T("Remove index is out of range") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+    wxSizerItem *item = node->GetData();
+
+    if( item->IsWindow() )
+        item->GetWindow()->SetContainingSizer( NULL );
+
+    delete item;
+    m_children.Erase( node );
+    return true;

 }
 
 }
 

-void wxSizer::Insert( int before, int width, int height, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Detach( wxSizer *sizer )

 {
 {

-    m_children.Insert( before, new wxSizerItem( width, height, option, flag, border, userData ) );
+    wxASSERT_MSG( sizer, _T("Detaching NULL sizer") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            item->DetachSizer();
+            delete item;
+            m_children.Erase( node );
+            return true;
+        }
+        node = node->GetNext();
+    }
+
+    return false;

 }
 
 }
 

-bool wxSizer::Remove( wxWindow *window )
+bool wxSizer::Detach( wxWindow *window )

 {
 {

-    wxASSERT( window );
+    wxASSERT_MSG( window, _T("Detaching NULL window") );

 
 

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

     while (node)
     {
     while (node)
     {

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

         if (item->GetWindow() == window)
         {
         if (item->GetWindow() == window)
         {

-            m_children.DeleteNode( node );
-            return TRUE;
+            item->GetWindow()->SetContainingSizer( NULL );
+            delete item;
+            m_children.Erase( node );
+            return true;

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxSizer::Remove( wxSizer *sizer )
+bool wxSizer::Detach( int index )

 {
 {

-    wxASSERT( sizer );
+    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
+                 false,
+                 _T("Detach index is out of range") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+    wxSizerItem *item = node->GetData();

 
 

-    wxNode *node = m_children.First();
+    if( item->IsSizer() )
+        item->DetachSizer();
+    else if( item->IsWindow() )
+        item->GetWindow()->SetContainingSizer( NULL );
+
+    delete item;
+    m_children.Erase( node );
+    return true;
+}
+
+void wxSizer::Clear( bool delete_windows )
+{
+    // First clear the ContainingSizer pointers
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxSizerItem *item = (wxSizerItem*)node->Data();
-        if (item->GetSizer() == sizer)
-        {
-            m_children.DeleteNode( node );
-            return TRUE;
-        }
-        node = node->Next();
+        wxSizerItem     *item = node->GetData();
+
+        if (item->IsWindow())
+            item->GetWindow()->SetContainingSizer( NULL );
+        node = node->GetNext();

     }
 
     }
 

-    return FALSE;
+    // Destroy the windows if needed
+    if (delete_windows)
+        DeleteWindows();
+
+    // Now empty the list
+    WX_CLEAR_LIST(wxSizerItemList, m_children);

 }
 
 }
 

-bool wxSizer::Remove( int pos )
+void wxSizer::DeleteWindows()

 {
 {

-    wxNode *node = m_children.Nth( pos );
-    if (!node) return FALSE;
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();

 
 

-    m_children.DeleteNode( node );
+        item->DeleteWindows();
+        node = node->GetNext();
+    }
+}
+
+wxSize wxSizer::Fit( wxWindow *window )
+{
+    wxSize size(window->IsTopLevel() ? FitSize(window)
+                                     : GetMinWindowSize(window));

 
 

-    return TRUE;
+    window->SetSize( size );
+
+    return size;

 }
 
 }
 

-void wxSizer::Fit( wxWindow *window )
+void wxSizer::FitInside( wxWindow *window )

 {
     wxSize size;
     if (window->IsTopLevel())
 {
     wxSize size;
     if (window->IsTopLevel())

-        size = FitSize( window );
+        size = VirtualFitSize( window );

     else
     else

-        size = GetMinWindowSize( window );
+        size = GetMinClientSize( window );

 
 

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

 }
 
 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();
 }
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {
     RecalcSizes();
 }
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {

-    wxSize size = FitSize( window );
-    window->SetSizeHints( size.x, size.y );
+    // Preserve the window's max size hints, but set the
+    // lower bound according to the sizer calculations.
+
+    wxSize size = Fit( window );
+
+    window->SetSizeHints( size.x,
+                          size.y,
+                          window->GetMaxWidth(),
+                          window->GetMaxHeight() );

 }
 
 }
 

-wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
+void wxSizer::SetVirtualSizeHints( wxWindow *window )

 {
 {

-    wxSize sizeMax = wxGetDisplaySize();
-    // make the max size a bit smaller than the screen, a window which takes
-    // the entire screen doesn't look very nice neither
-    sizeMax.x *= 9;
-    sizeMax.x /= 10;
-
-    sizeMax.y *= 9;
-    sizeMax.y /= 10;
+    // Preserve the window's max size hints, but set the
+    // lower bound according to the sizer calculations.
+
+    FitInside( window );
+    wxSize size( window->GetVirtualSize() );
+    window->SetVirtualSizeHints( size.x,
+                                 size.y,
+                                 window->GetMaxWidth(),
+                                 window->GetMaxHeight() );
+}

 
 

-    return sizeMax;
+wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) const
+{
+    return window->GetMaxSize();

 }
 
 wxSize wxSizer::GetMinWindowSize( wxWindow *window )
 {
 }
 
 wxSize wxSizer::GetMinWindowSize( wxWindow *window )
 {

-    wxSize minSize( GetMinSize() );
-    wxSize size( window->GetSize() );
-    wxSize client_size( window->GetClientSize() );
+    wxSize      minSize( GetMinSize() );
+    wxSize      size( window->GetSize() );
+    wxSize      client_size( window->GetClientSize() );
+

     return wxSize( minSize.x+size.x-client_size.x,
                    minSize.y+size.y-client_size.y );
 }
 
     return wxSize( minSize.x+size.x-client_size.x,
                    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 )
 {
     wxSize size     = GetMinWindowSize( window );
     wxSize sizeMax  = GetMaxWindowSize( window );
 
 // Return a window size that will fit within the screens dimensions
 wxSize wxSizer::FitSize( wxWindow *window )
 {
     wxSize size     = GetMinWindowSize( window );
     wxSize sizeMax  = GetMaxWindowSize( window );
 

-    if ( size.x > sizeMax.x )
+    // Limit the size if sizeMax != wxDefaultSize
+
+    if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
+        size.x = sizeMax.x;
+    if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
+        size.y = sizeMax.y;
+
+    return size;
+}
+
+wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const
+{
+    wxSize maxSize( window->GetMaxSize() );
+
+    if( maxSize != wxDefaultSize )
+    {
+        wxSize size( window->GetSize() );
+        wxSize client_size( window->GetClientSize() );
+
+        return wxSize( maxSize.x + client_size.x - size.x,
+                       maxSize.y + client_size.y - size.y );
+    }
+    else
+        return wxDefaultSize;
+}
+
+wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) )
+{
+    return GetMinSize();  // Already returns client size.
+}
+
+wxSize wxSizer::VirtualFitSize( wxWindow *window )
+{
+    wxSize size     = GetMinClientSize( window );
+    wxSize sizeMax  = GetMaxClientSize( window );
+
+    // Limit the size if sizeMax != wxDefaultSize
+
+    if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )

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

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

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


@@ -419,8 +645,7 @@ void wxSizer::SetDimension( int x, int y, int width, int height )
     m_position.y = y;
     m_size.x = width;
     m_size.y = height;
     m_position.y = y;
     m_size.x = width;
     m_size.y = height;

-    CalcMin();
-    RecalcSizes();
+    Layout();

 }
 
 wxSize wxSizer::GetMinSize()
 }
 
 wxSize wxSizer::GetMinSize()


@@ -439,128 +664,280 @@ void wxSizer::DoSetMinSize( int width, int height )
 
 bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 {
 
 bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 {

-    wxASSERT( window );
+    wxASSERT_MSG( window, _T("SetMinSize for NULL window") );
+
+    // Is it our immediate child?

 
 

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

     while (node)
     {
     while (node)
     {

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

         if (item->GetWindow() == window)
         {
         if (item->GetWindow() == window)
         {

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

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    node = m_children.First();
+    // No?  Search any subsizers we own then
+
+    node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxSizerItem *item = (wxSizerItem*)node->Data();
-        if (item->GetSizer())
+        wxSizerItem     *item = node->GetData();
+
+        if ( item->GetSizer() &&
+             item->GetSizer()->DoSetItemMinSize( window, width, height ) )

         {
         {

-            /* It's a sizer, so lets search recursively. */
-            if (item->GetSizer()->DoSetItemMinSize( window, width, height ))
-            {
-                /* A child sizer found the requested windw, exit. */
-                return TRUE;
-            }
+            // A child sizer found the requested windw, exit.
+            return true;

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
 {
 }
 
 bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
 {

-    wxASSERT( sizer );
+    wxASSERT_MSG( sizer, _T("SetMinSize for NULL sizer") );
+
+    // Is it our immediate child?

 
 

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

     while (node)
     {
     while (node)
     {

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

         if (item->GetSizer() == sizer)
         {
             item->GetSizer()->DoSetMinSize( width, height );
         if (item->GetSizer() == sizer)
         {
             item->GetSizer()->DoSetMinSize( width, height );

-            return TRUE;
+            return true;

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    node = m_children.First();
+    // No?  Search any subsizers we own then
+
+    node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxSizerItem *item = (wxSizerItem*)node->Data();
-        if (item->GetSizer())
+        wxSizerItem     *item = node->GetData();
+
+        if ( item->GetSizer() &&
+             item->GetSizer()->DoSetItemMinSize( sizer, width, height ) )

         {
         {

-            /* It's a sizer, so lets search recursively. */
-            if (item->GetSizer()->DoSetItemMinSize( sizer, width, height ))
-            {
-                /* A child sizer found the requested windw, exit. */
-                return TRUE;
-            }
+            // A child found the requested sizer, exit.
+            return true;

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxSizer::DoSetItemMinSize( int pos, int width, int height )
+bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )

 {
 {

-    wxNode *node = m_children.Nth( pos );
-    if (!node) return FALSE;
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+    wxSizerItem     *item = node->GetData();

 
 

-    wxSizerItem *item = (wxSizerItem*) node->Data();

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

-        /* Sizers contains the minimal size in them, if not calculated ... */
+        // Sizers contains the minimal size in them, if not calculated ...

         item->GetSizer()->DoSetMinSize( width, height );
     }
     else
     {
         item->GetSizer()->DoSetMinSize( width, height );
     }
     else
     {

-        /* ... whereas the minimal size of spacers and windows in stored
-           in the item */
-        item->SetInitSize( width, height );
+        // ... but the minimal size of spacers and windows is stored via the item
+        item->SetMinSize( width, height );
+    }
+
+    return true;
+}
+
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
+{
+    wxASSERT_MSG( window, _T("Show for NULL window") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetWindow() == window)
+        {
+            item->Show( show );
+
+            return true;
+        }
+        else if (recursive && item->IsSizer())
+        {
+            if (item->GetSizer()->Show(window, show, recursive))
+                return true;
+        }
+
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
+{
+    wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            item->Show( show );
+
+            return true;
+        }
+        else if (recursive && item->IsSizer())
+        {
+            if (item->GetSizer()->Show(sizer, show, recursive))
+                return true;
+        }
+
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::Show( size_t index, bool show)
+{
+    wxCHECK_MSG( index < m_children.GetCount(),
+                 false,
+                 _T("Show index is out of range") );
+
+    m_children.Item( index )->GetData()->Show( show );
+
+    return true;
+}
+
+void wxSizer::ShowItems( bool show )
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        node->GetData()->Show( show );
+        node = node->GetNext();
+    }
+}
+
+bool wxSizer::IsShown( wxWindow *window ) const
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetWindow() == window)
+        {
+            return item->IsShown();
+        }
+        node = node->GetNext();
+    }
+
+    wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+
+    return false;
+}
+
+bool wxSizer::IsShown( wxSizer *sizer ) const
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            return item->IsShown();
+        }
+        node = node->GetNext();

     }
 
     }
 

-    return TRUE;
+    wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+
+    return false;

 }
 
 }
 

+bool wxSizer::IsShown( size_t index ) const
+{
+    wxCHECK_MSG( index < m_children.GetCount(),
+                 false,
+                 _T("IsShown index is out of range") );
+
+    return m_children.Item( index )->GetData()->IsShown();
+}
+
+

 //---------------------------------------------------------------------------
 // wxGridSizer
 //---------------------------------------------------------------------------
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
 //---------------------------------------------------------------------------
 // wxGridSizer
 //---------------------------------------------------------------------------
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )

+    : m_rows( rows )
+    , m_cols( cols )
+    , m_vgap( vgap )
+    , m_hgap( hgap )

 {
 {

-    m_rows = rows;
-    m_cols = cols;
-    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 )

+    : m_rows( 0 )
+    , m_cols( cols )
+    , m_vgap( vgap )
+    , m_hgap( hgap )

 {
 {

-    m_rows = 0;
-    m_cols = cols;
-    m_vgap = vgap;
-    m_hgap = hgap;
+    if (m_rows == 0 && m_cols == 0)
+        m_rows = 1;

 }
 
 }
 

-void wxGridSizer::RecalcSizes()
+int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const

 {
 {

-    if (m_children.GetCount() == 0)
-        return;
-

     int nitems = m_children.GetCount();
     int nitems = m_children.GetCount();

-    int nrows = m_rows;
-    int ncols = m_cols;
+    if ( nitems)
+    {
+        if ( m_cols )
+        {
+            ncols = m_cols;
+            nrows = (nitems + m_cols - 1) / m_cols;
+        }
+        else if ( m_rows )
+        {
+            ncols = (nitems + m_rows - 1) / m_rows;
+            nrows = m_rows;
+        }
+        else // 0 columns, 0 rows?
+        {
+            wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") );

 
 

-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
+            nrows = ncols = 0;
+        }
+    }
+
+    return nitems;
+}
+
+void wxGridSizer::RecalcSizes()
+{
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+        return;

 
     wxSize sz( GetSize() );
     wxPoint pt( GetPosition() );
 
     wxSize sz( GetSize() );
     wxPoint pt( GetPosition() );


@@ -577,10 +954,11 @@ void wxGridSizer::RecalcSizes()
             int i = r * ncols + c;
             if (i < nitems)
             {
             int i = r * ncols + c;
             if (i < nitems)
             {

-                wxNode *node = m_children.Nth( i );
-                wxASSERT( node );
+                wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+
+                wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );

 
 

-                SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h);
+                SetItemBounds( node->GetData(), x, y, w, h);

             }
             y = y + h + m_vgap;
         }
             }
             y = y + h + m_vgap;
         }


@@ -590,41 +968,34 @@ void wxGridSizer::RecalcSizes()
 
 wxSize wxGridSizer::CalcMin()
 {
 
 wxSize wxGridSizer::CalcMin()
 {

-    if (m_children.GetCount() == 0)
-        return wxSize(10,10);
+    int nrows, ncols;
+    if ( CalcRowsCols(nrows, ncols) == 0 )
+        return wxSize(10, 10);

 
 

-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
-
-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
-
-    /* Find the max width and height for any component */
+    // Find the max width and height for any component

     int w = 0;
     int h = 0;
 
     int w = 0;
     int h = 0;
 

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

     while (node)
     {
     while (node)
     {

-        wxSizerItem *item = (wxSizerItem*)node->Data();
-        wxSize sz( item->CalcMin() );
+        wxSizerItem     *item = node->GetData();
+        wxSize           sz( item->CalcMin() );
+

         w = wxMax( w, sz.x );
         h = wxMax( h, sz.y );
 
         w = wxMax( w, sz.x );
         h = wxMax( h, sz.y );
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

-    return wxSize(ncols * w + (ncols-1) * m_hgap,
-                  nrows * h + (nrows-1) * m_vgap);
+    return wxSize( ncols * w + (ncols-1) * m_hgap,
+                   nrows * h + (nrows-1) * m_vgap );

 }
 
 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))


@@ -660,88 +1031,33 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
 //---------------------------------------------------------------------------
 
 wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
 //---------------------------------------------------------------------------
 
 wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )

-   : wxGridSizer( rows, cols, vgap, hgap )
+               : wxGridSizer( rows, cols, vgap, hgap ),
+                 m_flexDirection(wxBOTH),
+                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)

 {
 {

-    m_rowHeights = (int*) NULL;
-    m_colWidths = (int*) NULL;

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

-   : wxGridSizer( cols, vgap, hgap )
+               : wxGridSizer( cols, vgap, hgap ),
+                 m_flexDirection(wxBOTH),
+                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)

 {
 {

-    m_rowHeights = (int*) NULL;
-    m_colWidths = (int*) NULL;

 }
 
 wxFlexGridSizer::~wxFlexGridSizer()
 {
 }
 
 wxFlexGridSizer::~wxFlexGridSizer()
 {

-    if (m_rowHeights)
-        delete[] m_rowHeights;
-    if (m_colWidths)
-        delete[] m_colWidths;
-}
-
-void wxFlexGridSizer::CreateArrays()
-{
-    if (m_rowHeights)
-        delete[] m_rowHeights;
-    if (m_colWidths)
-        delete[] m_colWidths;
-
-    if (m_children.GetCount() == 0)
-        return;
-
-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
-
-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
-
-    m_rowHeights = new int[nrows];
-    m_colWidths = new int[ncols];
-
-    for (int col = 0; col < ncols; col++)
-        m_colWidths[ col ] = 0;
-    for (int row = 0; row < nrows; row++)
-        m_rowHeights[ row ] = 0;

 }
 
 void wxFlexGridSizer::RecalcSizes()
 {
 }
 
 void wxFlexGridSizer::RecalcSizes()
 {

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

         return;
 
         return;
 

-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
-
-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
-
-    wxSize sz( GetSize() );
-    wxSize minsz( CalcMin() );

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

-    int    delta;
-    size_t idx;
-
-    if ((m_growableRows.GetCount() > 0) && (sz.y > minsz.y))
-    {
-        delta = (sz.y - minsz.y) / m_growableRows.GetCount();
-        for (idx = 0; idx < m_growableRows.GetCount(); idx++)
-            m_rowHeights[ m_growableRows[idx] ] += delta;
-    }
+    wxSize sz( GetSize() );

 
 

-    if ((m_growableCols.GetCount() > 0) && (sz.x > minsz.x))
-    {
-        delta = (sz.x - minsz.x) / m_growableCols.GetCount();
-        for (idx = 0; idx < m_growableCols.GetCount(); idx++)
-            m_colWidths[ m_growableCols[idx] ] += delta;
-    }
+    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 );
 


@@ -754,13 +1070,14 @@ void wxFlexGridSizer::RecalcSizes()
             int i = r * ncols + c;
             if (i < nitems)
             {
             int i = r * ncols + c;
             if (i < nitems)
             {

-                wxNode *node = m_children.Nth( i );
-                wxASSERT( node );
+                wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+
+                wxASSERT_MSG( node, _T("Failed to find node") );

 
                 int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) );
                 int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) );
 
 
                 int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) );
                 int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) );
 

-                SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h);
+                SetItemBounds( node->GetData(), x, y, w, h);

             }
             y = y + m_rowHeights[r] + m_vgap;
         }
             }
             y = y + m_rowHeights[r] + m_vgap;
         }


@@ -770,66 +1087,223 @@ void wxFlexGridSizer::RecalcSizes()
 
 wxSize wxFlexGridSizer::CalcMin()
 {
 
 wxSize wxFlexGridSizer::CalcMin()
 {

-    if (m_children.GetCount() == 0)
-        return wxSize(10,10);
+    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);
+
+    // 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();
+        if ( item->IsShown() )
+        {
+            wxSize sz( item->CalcMin() );
+            int row = i / ncols;
+            int col = i % ncols;

 
 

-    int nitems = m_children.GetCount();
-    int nrows = m_rows;
-    int ncols = m_cols;
+            m_rowHeights[ row ] = wxMax( wxMax( 0, sz.y ), m_rowHeights[ row ] );
+            m_colWidths[ col ] = wxMax( wxMax( 0, sz.x ), m_colWidths[ col ] );
+        }

 
 

-    if (ncols > 0)
-        nrows = (nitems + ncols-1) / ncols;
-    else
-        ncols = (nitems + nrows-1) / nrows;
+        node = node->GetNext();
+        i++;
+    }
+
+    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 );

 
 

-    CreateArrays();
+    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 );

 
 

-    int col;
-    int row;
+    m_calculatedMinSize = wxSize( width, height );
+    return m_calculatedMinSize;
+}

 
 

-    int i = 0;
-    wxNode *node = m_children.First();
-    while (node)
+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 )

     {
     {

-        wxSizerItem *item = (wxSizerItem*)node->Data();
-        wxSize sz( item->CalcMin() );
-        row = i / ncols;
-        col = i % ncols;
-        m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] );
-        m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] );
-
-        node = node->Next();
-        i++;
+        // select the array corresponding to the direction in which we do *not*
+        // resize flexibly
+        wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths
+                                                          : m_rowHeights;
+
+        const int count = array.GetCount();
+
+        // find the largest value in this array
+        int n, largest = 0;
+        for ( n = 0; n < count; ++n )
+        {
+            if ( array[n] > largest )
+                largest = array[n];
+        }
+
+        // and now fill it with the largest value
+        for ( n = 0; n < count; ++n )
+        {
+            array[n] = largest;
+        }

     }
     }

+}

 
 

-    int width = 0;
-    for (col = 0; col < ncols; col++)
-        width += m_colWidths[ col ];

 
 

-    int height = 0;
-    for (row = 0; row < nrows; row++)
-        height += m_rowHeights[ row ];
+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++;
+        }
+
+        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;
+    }

 
 

-    return wxSize( width +  (ncols-1) * m_hgap,
-                   height + (nrows-1) * m_vgap);
+    // 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++;
+        }
+
+        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 );

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


@@ -837,8 +1311,8 @@ void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) )
 //---------------------------------------------------------------------------
 
 wxBoxSizer::wxBoxSizer( int orient )
 //---------------------------------------------------------------------------
 
 wxBoxSizer::wxBoxSizer( int orient )

+    : m_orient( orient )

 {
 {

-    m_orient = orient;

 }
 
 void wxBoxSizer::RecalcSizes()
 }
 
 void wxBoxSizer::RecalcSizes()


@@ -847,86 +1321,80 @@ 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 );
 

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

     while (node)
     {
     while (node)
     {

-        wxSizerItem *item = (wxSizerItem*) node->Data();
-
-        int weight = 1;
-        if (item->GetOption())
-            weight = item->GetOption();
+        wxSizerItem     *item = node->GetData();

 
 

-        wxSize size( item->CalcMin() );
-
-        if (m_orient == wxVERTICAL)
+        if (item->IsShown())

         {
         {

-            wxCoord height = size.y;
-            if (item->GetOption())
+            wxSize size( item->GetMinSizeWithBorder() );
+
+            if (m_orient == wxVERTICAL)

             {
             {

-                height = (delta * weight) + extra;
-                extra = 0; // only the first item will get the remainder as extra size
+                wxCoord height = size.y;
+                if (item->GetProportion())
+                {
+                    // 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 );
+                wxSize  child_size( wxSize( size.x, height) );
+
+                if (item->GetFlag() & (wxEXPAND | wxSHAPED))
+                    child_size.x = m_size.x;
+                else if (item->GetFlag() & wxALIGN_RIGHT)
+                    child_pos.x += m_size.x - size.x;
+                else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL))
+                // XXX wxCENTER is added for backward compatibility;
+                //     wxALIGN_CENTER should be used in new code
+                    child_pos.x += (m_size.x - size.x) / 2;
+
+                item->SetDimension( child_pos, child_size );
+
+                pt.y += height;

             }
             }

-
-            wxPoint child_pos( pt );
-            wxSize  child_size( wxSize( size.x, height) );
-
-            if (item->GetFlag() & (wxEXPAND | wxSHAPED))
-                child_size.x = m_size.x;
-            else if (item->GetFlag() & wxALIGN_RIGHT)
-                child_pos.x += m_size.x - size.x;
-            else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL))
-            // XXX wxCENTER is added for backward compatibility;
-            //     wxALIGN_CENTER should be used in new code
-                child_pos.x += (m_size.x - size.x) / 2;
-
-            item->SetDimension( child_pos, child_size );
-
-            pt.y += height;
-        }
-        else
-        {
-            wxCoord width = size.x;
-            if (item->GetOption())
+            else

             {
             {

-                width = (delta * weight) + extra;
-                extra = 0; // only the first item will get the remainder as extra size
+                wxCoord width = size.x;
+                if (item->GetProportion())
+                {
+                    // 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 );
+                wxSize  child_size( wxSize(width, size.y) );
+
+                if (item->GetFlag() & (wxEXPAND | wxSHAPED))
+                    child_size.y = m_size.y;
+                else if (item->GetFlag() & wxALIGN_BOTTOM)
+                    child_pos.y += m_size.y - size.y;
+                else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL))
+                // XXX wxCENTER is added for backward compatibility;
+                //     wxALIGN_CENTER should be used in new code
+                    child_pos.y += (m_size.y - size.y) / 2;
+
+                item->SetDimension( child_pos, child_size );
+
+                pt.x += width;

             }
             }

-
-            wxPoint child_pos( pt );
-            wxSize  child_size( wxSize(width, size.y) );
-
-            if (item->GetFlag() & (wxEXPAND | wxSHAPED))
-                child_size.y = m_size.y;
-            else if (item->GetFlag() & wxALIGN_BOTTOM)
-                child_pos.y += m_size.y - size.y;
-            else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL))
-            // XXX wxCENTER is added for backward compatibility;
-            //     wxALIGN_CENTER should be used in new code
-                child_pos.y += (m_size.y - size.y) / 2;
-
-            item->SetDimension( child_pos, child_size );
-
-            pt.x += width;

         }
 
         }
 

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -941,41 +1409,91 @@ wxSize wxBoxSizer::CalcMin()
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 

-    wxNode *node = m_children.GetFirst();
+    // precalc item minsizes and count proportions
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

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

 
 

-        m_stretchable += item->GetOption();
+        if (item->IsShown())
+            item->CalcMin();  // result is stored in the item

 
 

-        wxSize size( item->CalcMin() );
+        if (item->IsShown() && item->GetProportion() != 0)
+            m_stretchable += item->GetProportion();

 
 

-        if (m_orient == wxHORIZONTAL)
-        {
-            m_minWidth += size.x;
-            m_minHeight = wxMax( m_minHeight, size.y );
-        }
-        else
+        node = node->GetNext();
+    }
+
+    // Total minimum size (width or height) of sizer
+    int maxMinSize = 0;
+
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = node->GetData();
+
+        if (item->IsShown() && item->GetProportion() != 0)

         {
         {

-            m_minHeight += size.y;
-            m_minWidth = wxMax( m_minWidth, size.x );
+            int stretch = item->GetProportion();
+            wxSize size( item->GetMinSizeWithBorder() );
+            int minSize;
+
+            // 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)
+                minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
+            else
+                minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
+
+            if (minSize > maxMinSize)
+                maxMinSize = minSize;

         }
         }

+        node = node->GetNext();
+    }
+
+    // Calculate overall minimum size
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = node->GetData();

 
 

-        if (item->GetOption() == 0)
+        if (item->IsShown())

         {
         {

-            if (m_orient == wxVERTICAL)
+            wxSize size( item->GetMinSizeWithBorder() );
+            if (item->GetProportion() != 0)

             {
             {

-                m_fixedHeight += size.y;
-                m_fixedWidth = wxMax( m_fixedWidth, size.x );
+                if (m_orient == wxHORIZONTAL)
+                    size.x = (maxMinSize*item->GetProportion())/m_stretchable;
+                else
+                    size.y = (maxMinSize*item->GetProportion())/m_stretchable;

             }
             else
             {
             }
             else
             {

-                m_fixedWidth += size.x;
-                m_fixedHeight = wxMax( m_fixedHeight, size.y );
+                if (m_orient == wxVERTICAL)
+                {
+                    m_fixedHeight += size.y;
+                    m_fixedWidth = wxMax( m_fixedWidth, size.x );
+                }
+                else
+                {
+                    m_fixedWidth += size.x;
+                    m_fixedHeight = wxMax( m_fixedHeight, size.y );
+                }

             }
             }

-        }

 
 

-        node = node->Next();
+            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();

     }
 
     return wxSize( m_minWidth, m_minHeight );
     }
 
     return wxSize( m_minWidth, m_minHeight );


@@ -985,27 +1503,58 @@ wxSize wxBoxSizer::CalcMin()
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 

+#if wxUSE_STATBOX
+

 wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
 wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )

-                : wxBoxSizer( orient )
+    : wxBoxSizer( orient )
+    , m_staticBox( box )

 {
     wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") );
 {
     wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") );

-
-    m_staticBox = box;

 }
 
 }
 

-static void GetStaticBoxBorders(wxStaticBox *box,
-                                int *borderTop, int *borderOther)
+static void GetStaticBoxBorders( wxStaticBox *box,
+                                 int *borderTop,
+                                 int *borderOther)

 {
     // 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__
     if ( box->GetLabel().IsEmpty() )
         *borderTop = 5;
     else
 #endif // __WXGTK__
 #ifdef __WXGTK__
     if ( box->GetLabel().IsEmpty() )
         *borderTop = 5;
     else
 #endif // __WXGTK__

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

     *borderOther = 5;
     *borderOther = 5;

+#endif // __WXCOCOA__

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


@@ -1040,49 +1589,58 @@ wxSize wxStaticBoxSizer::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

-//---------------------------------------------------------------------------
+void wxStaticBoxSizer::ShowItems( bool show )
+{
+    m_staticBox->Show( show );
+    wxBoxSizer::ShowItems( show );
+}
+
+#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

 
 

-wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
-{
-    wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
+#if wxUSE_BOOKCTRL

 
 

-    m_notebook = nb;
+wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
+               : m_bookctrl(bookctrl)
+{
+    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()

 {
 {

-    // This will have to be done platform by platform
-    // as there is no way to guess the thickness of
-    // the wxNotebook tabs and border.
+    wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0, 0));

 
 

-    int borderX = 5;
-    int borderY = 5;
-    if ((m_notebook->HasFlag(wxNB_RIGHT)) ||
-        (m_notebook->HasFlag(wxNB_LEFT)))
-    {
-        borderX += 90; // improvements later..
-    }
-    else
+    sizeBorder.x += 5;
+    sizeBorder.y += 5;
+
+    if ( m_bookctrl->GetPageCount() == 0 )

     {
     {

-        borderY += 40; // improvements later..
+        return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);

     }
 
     }
 

-    if (m_notebook->GetChildren().GetCount() == 0)
-        return wxSize(borderX + 10, borderY + 10);
-

     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();


@@ -1092,14 +1650,27 @@ wxSize wxNotebookSizer::CalcMin()
         {
             wxSize subsize( itemsizer->CalcMin() );
 
         {
             wxSize subsize( itemsizer->CalcMin() );
 

-            if (subsize.x > maxX) maxX = subsize.x;
-            if (subsize.y > maxY) maxY = subsize.y;
+            if (subsize.x > maxX)
+                maxX = subsize.x;
+            if (subsize.y > maxY)
+                maxY = subsize.y;

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

-    return wxSize( borderX + maxX, borderY + maxY );
+    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
+
+#endif // WXWIN_COMPATIBILITY_2_4