XRC needs wxXML, check it

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index a711c7b0c2b75181f7f63e39569eb6ff5cb4973e..475867e17b734abb37d4d022441df79b9869d0cc 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -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,51 +43,63 @@ IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
 #if wxUSE_STATBOX
 IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 #endif
 #if wxUSE_STATBOX
 IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 #endif

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

 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 
 /*
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 
 /*

-       TODO PROPERTIES
-         sizeritem
-           object
-               object_ref
-                 minsize
-                 option
-                 flag
-                 border
+    TODO PROPERTIES
+      sizeritem
+        object
+        object_ref
+          minsize
+          option
+          flag
+          border

      spacer
      spacer

-               option
-               flag
-               borfder
-       boxsizer
-          orient
+        option
+        flag
+        borfder
+    boxsizer
+       orient

     staticboxsizer
     staticboxsizer

-          orient
-          label
-       gridsizer
-          rows
-          cols
-          vgap
-          hgap
-       flexgridsizer
-          rows
-          cols
-          vgap
-          hgap
-          growablerows
-          growablecols
+       orient
+       label
+    gridsizer
+       rows
+       cols
+       vgap
+       hgap
+    flexgridsizer
+       rows
+       cols
+       vgap
+       hgap
+       growablerows
+       growablecols

     minsize
 */
     minsize
 */

+

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

+void wxSizerItem::Init()
+{
+    m_window = NULL;
+    m_sizer = NULL;
+    m_show = true;
+    m_userData = NULL;
+}
+
+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 )


@@ -99,13 +117,16 @@ 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_show( true )
     , m_userData( userData )
 {
     , 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
     SetRatio( m_minSize );
 
     // aspect ratio calculated from initial size
     SetRatio( m_minSize );
 


@@ -126,6 +147,15 @@ 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()
 {
     delete m_userData;
 wxSizerItem::~wxSizerItem()
 {
     delete m_userData;


@@ -165,30 +195,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)


@@ -201,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)


@@ -266,7 +296,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();


@@ -324,89 +357,6 @@ wxSizer::~wxSizer()
     WX_CLEAR_LIST(wxSizerItemList, m_children);
 }
 
     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 )
 {
     m_children.Insert( index, item );
 void wxSizer::Insert( size_t index, wxSizerItem *item )
 {
     m_children.Insert( index, item );


@@ -584,7 +534,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();
 }
 


@@ -629,6 +583,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 )
 {


@@ -637,9 +595,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;


@@ -673,9 +631,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;


@@ -717,7 +675,7 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
 
         if (item->GetWindow() == window)
         {
 
         if (item->GetWindow() == window)
         {

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

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


@@ -795,14 +753,14 @@ 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 )
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )

 {
     wxASSERT_MSG( window, _T("Show for NULL window") );
 
 {
     wxASSERT_MSG( window, _T("Show for NULL window") );
 


@@ -814,13 +772,22 @@ void wxSizer::Show( wxWindow *window, bool show )
         if (item->GetWindow() == window)
         {
             item->Show( show );
         if (item->GetWindow() == window)
         {
             item->Show( show );

-            break;
+
+            return true;

         }
         }

+        else if (recursive && item->IsSizer())
+        {
+            if (item->GetSizer()->Show(window, show, recursive))
+                return true;
+        }
+

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

+
+    return false;

 }
 
 }
 

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

 {
     wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
 
 {
     wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
 


@@ -832,18 +799,30 @@ void wxSizer::Show( wxSizer *sizer, bool show )
         if (item->GetSizer() == sizer)
         {
             item->Show( show );
         if (item->GetSizer() == sizer)
         {
             item->Show( show );

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

         }
         }

+

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

+
+    return false;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( index < m_children.GetCount(),
+    wxCHECK_MSG( index < m_children.GetCount(),
+                 false,

                  _T("Show index is out of range") );
 
     m_children.Item( index )->GetData()->Show( show );
                  _T("Show index is out of range") );
 
     m_children.Item( index )->GetData()->Show( show );

+
+    return true;

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


@@ -914,6 +893,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 )


@@ -922,6 +903,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


@@ -1012,7 +995,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))


@@ -1071,107 +1054,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() );

+    wxSize sz( GetSize() );

 
 

-    // 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;
-    }
-
-    // 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];
-            // wtb 5/12/02 bugfix - was m_ColWidths[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;
-    }
+    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 );
 


@@ -1212,10 +1098,11 @@ wxSize wxFlexGridSizer::CalcMin()
     m_rowHeights.SetCount(nrows);
     m_colWidths.SetCount(ncols);
 
     m_rowHeights.SetCount(nrows);
     m_colWidths.SetCount(ncols);
 

-    // We have to recalcuate the sizes in case an item has wxADJUST_MINSIZE, has changed
-    // minimum size since the previous layout, or 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.
+    // 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 )
     for( s = m_rowHeights.GetCount(), i = 0; i < s; ++i )
         m_rowHeights[ i ] = -1;
     for( s = m_colWidths.GetCount(), i = 0; i < s; ++i )


@@ -1241,8 +1128,28 @@ wxSize wxFlexGridSizer::CalcMin()
         i++;
     }
 
         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*


@@ -1266,22 +1173,117 @@ wxSize wxFlexGridSizer::CalcMin()
             array[n] = largest;
         }
     }
             array[n] = largest;
         }
     }

+}

 
 

-    // 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 );
+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, height );
+    // 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, int proportion )
 {
     m_growableRows.Add( idx );
 void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
 {
     m_growableRows.Add( idx );


@@ -1336,7 +1338,7 @@ void wxBoxSizer::RecalcSizes()
 
         if (item->IsShown())
         {
 
         if (item->IsShown())
         {

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

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


@@ -1407,11 +1409,15 @@ wxSize wxBoxSizer::CalcMin()
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 

+    // precalc item minsizes and count proportions

     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
         wxSizerItem *item = node->GetData();
 
     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();
 
         if (item->IsShown() && item->GetProportion() != 0)
             m_stretchable += item->GetProportion();
 


@@ -1429,9 +1435,9 @@ wxSize wxBoxSizer::CalcMin()
         if (item->IsShown() && item->GetProportion() != 0)
         {
             int stretch = item->GetProportion();
         if (item->IsShown() && item->GetProportion() != 0)
         {
             int stretch = item->GetProportion();

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

             int minSize;
             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
             // 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


@@ -1439,7 +1445,7 @@ wxSize wxBoxSizer::CalcMin()
                 minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
             else
                 minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
                 minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
             else
                 minSize = ( size.y*m_stretchable + stretch - 1)/stretch;

-            
+

             if (minSize > maxMinSize)
                 maxMinSize = minSize;
         }
             if (minSize > maxMinSize)
                 maxMinSize = minSize;
         }


@@ -1454,7 +1460,7 @@ wxSize wxBoxSizer::CalcMin()
 
         if (item->IsShown())
         {
 
         if (item->IsShown())
         {

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

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


@@ -1514,7 +1520,32 @@ static void GetStaticBoxBorders( wxStaticBox *box,
     // guess the thickness of a wxStaticBox border
 #ifdef __WXCOCOA__
     box->GetBordersForSizer(borderTop,borderOther);
     // guess the thickness of a wxStaticBox border
 #ifdef __WXCOCOA__
     box->GetBordersForSizer(borderTop,borderOther);

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


@@ -1558,12 +1589,28 @@ 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
+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
+

 #if wxUSE_BOOKCTRL
 
 wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
 #if wxUSE_BOOKCTRL
 
 wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)


@@ -1615,14 +1662,15 @@ wxSize wxBookCtrlSizer::CalcMin()
     return wxSize( maxX, maxY ) + sizeBorder;
 }
 
     return wxSize( maxX, maxY ) + sizeBorder;
 }
 

-

 #if wxUSE_NOTEBOOK
 
 wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
 #if wxUSE_NOTEBOOK
 
 wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)

-    : wxBookCtrlSizer(nb)

 {
 {

+    wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+    m_bookctrl = nb;

 }
 
 #endif // wxUSE_NOTEBOOOK
 #endif // wxUSE_BOOKCTRL
 
 }
 
 #endif // wxUSE_NOTEBOOOK
 #endif // wxUSE_BOOKCTRL
 

+#endif // WXWIN_COMPATIBILITY_2_4