applied patch 432814: saving BMP in 1, 4 and 8 bpp

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 8659c709473510904c80783396a0a34aa35a6543..7b2fbb4e741402b6235e8c1a11791563b2e3c568 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -32,7 +32,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
 IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);

+#if wxUSE_STATBOX

 IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
 IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);

+#endif

 #if wxUSE_NOTEBOOK
 IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer);
 #endif
 #if wxUSE_NOTEBOOK
 IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer);
 #endif


@@ -133,21 +135,28 @@ wxSize wxSizerItem::CalcMin()
     if (IsSizer())
     {
         ret = m_sizer->GetMinSize();
     if (IsSizer())
     {
         ret = m_sizer->GetMinSize();

+

         // if we have to preserve aspect ratio _AND_ this is
         // the first-time calculation, consider ret to be initial size
         // 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);
+        if ((m_flag & wxSHAPED) && !m_ratio)
+            SetRatio(ret);

     }
     }

-
-/*
-    The minimum size of a window should be the
-    initial size, as saved in m_minSize, not the
-    current size.
-

     else
     else

-    if (IsWindow())
-        ret = m_window->GetSize();
-*/
-    else ret = m_minSize;
+    {
+        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;
+    }

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


@@ -163,30 +172,12 @@ wxSize wxSizerItem::CalcMin()
 
 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {
 
 void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 {

-    m_pos = pos;
-    
-    if (m_flag & wxWEST)
-    {
-        pos.x += m_border;
-        size.x -= m_border;
-    }
-    if (m_flag & wxEAST)
-    {
-        size.x -= m_border;
-    }
-    if (m_flag & wxNORTH)
-    {
-        pos.y += m_border;
-        size.y -= m_border;
-    }
-    if (m_flag & wxSOUTH)
+    if (m_flag & wxSHAPED)

     {
     {

-        size.y -= m_border;
-    }
-    if (m_flag & wxSHAPED) {

         // adjust aspect ratio
         int rwidth = (int) (size.y * m_ratio);
         // adjust aspect ratio
         int rwidth = (int) (size.y * m_ratio);

-        if (rwidth > size.x) {
+        if (rwidth > size.x)
+        {

             // fit horizontally
             int rheight = (int) (size.x / m_ratio);
             // add vertical space
             // fit horizontally
             int rheight = (int) (size.x / m_ratio);
             // add vertical space


@@ -196,7 +187,9 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
                 pos.y += (size.y - rheight);
             // use reduced dimensions
             size.y =rheight;
                 pos.y += (size.y - rheight);
             // use reduced dimensions
             size.y =rheight;

-        } else if (rwidth < size.x) {
+        }
+        else if (rwidth < size.x)
+        {

             // add horizontal space
             if (m_flag & wxALIGN_CENTER_HORIZONTAL)
                 pos.x += (size.x - rwidth) / 2;
             // add horizontal space
             if (m_flag & wxALIGN_CENTER_HORIZONTAL)
                 pos.x += (size.x - rwidth) / 2;


@@ -206,6 +199,30 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
         }
     }
 
         }
     }
 

+    // This is what GetPosition() returns. Since we calculate
+    // borders afterwards, GetPosition() will be the left/top
+    // corner of the surrounding border.
+    m_pos = pos;
+
+    if (m_flag & wxWEST)
+    {
+        pos.x += m_border;
+        size.x -= m_border;
+    }
+    if (m_flag & wxEAST)
+    {
+        size.x -= m_border;
+    }
+    if (m_flag & wxNORTH)
+    {
+        pos.y += m_border;
+        size.y -= m_border;
+    }
+    if (m_flag & wxSOUTH)
+    {
+        size.y -= m_border;
+    }
+

     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 
     if (IsSizer())
         m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
 


@@ -298,11 +315,11 @@ bool wxSizer::Remove( wxWindow *window )
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();

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

             m_children.DeleteNode( node );
             m_children.DeleteNode( node );

-               return TRUE;
-           }
+            return TRUE;
+        }

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


@@ -317,11 +334,11 @@ bool wxSizer::Remove( wxSizer *sizer )
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();

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

             m_children.DeleteNode( node );
             m_children.DeleteNode( node );

-               return TRUE;
-           }
+            return TRUE;
+        }

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


@@ -340,7 +357,13 @@ bool wxSizer::Remove( int pos )
 
 void wxSizer::Fit( wxWindow *window )
 {
 
 void wxSizer::Fit( wxWindow *window )
 {

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

 }
 
 void wxSizer::Layout()
 }
 
 void wxSizer::Layout()


@@ -351,10 +374,31 @@ void wxSizer::Layout()
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {

-    wxSize size( GetMinWindowSize( window ) );
+    wxSize size = FitSize( window );

     window->SetSizeHints( size.x, size.y );
 }
 
     window->SetSizeHints( size.x, size.y );
 }
 

+wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
+{
+    wxRect rect = wxGetClientDisplayRect();
+    wxSize sizeMax (rect.width,rect.height);
+
+    // Sorry, but this bit is wrong -- it makes a window that should just be
+    // able to fit onto the screen, not fit on the screen. -- JACS
+#if 0
+    // Make the max size a bit smaller than the visible portion of
+    // the screen.  A window which takes the entire screen doesn't
+    // look very nice either
+    sizeMax.x *= 9;
+    sizeMax.x /= 10;
+
+    sizeMax.y *= 9;
+    sizeMax.y /= 10;
+#endif
+
+    return sizeMax;
+}
+

 wxSize wxSizer::GetMinWindowSize( wxWindow *window )
 {
     wxSize minSize( GetMinSize() );
 wxSize wxSizer::GetMinWindowSize( wxWindow *window )
 {
     wxSize minSize( GetMinSize() );


@@ -364,6 +408,20 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window )
                    minSize.y+size.y-client_size.y );
 }
 
                    minSize.y+size.y-client_size.y );
 }
 

+// 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 )
+        size.x = sizeMax.x;
+    if ( size.y > sizeMax.y )
+        size.y = sizeMax.y;
+
+    return size;
+}
+

 void wxSizer::SetDimension( int x, int y, int width, int height )
 {
     m_position.x = x;
 void wxSizer::SetDimension( int x, int y, int width, int height )
 {
     m_position.x = x;


@@ -375,11 +433,11 @@ void wxSizer::SetDimension( int x, int y, int width, int height )
 }
 
 wxSize wxSizer::GetMinSize()
 }
 
 wxSize wxSizer::GetMinSize()

-{ 
+{

     wxSize ret( CalcMin() );
     if (ret.x < m_minSize.x) ret.x = m_minSize.x;
     if (ret.y < m_minSize.y) ret.y = m_minSize.y;
     wxSize ret( CalcMin() );
     if (ret.x < m_minSize.x) ret.x = m_minSize.x;
     if (ret.y < m_minSize.y) ret.y = m_minSize.y;

-    return ret; 
+    return ret;

 }
 
 void wxSizer::DoSetMinSize( int width, int height )
 }
 
 void wxSizer::DoSetMinSize( int width, int height )


@@ -396,11 +454,11 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();

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

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

-               return TRUE;
-           }
+            return TRUE;
+        }

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


@@ -408,15 +466,15 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();

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

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

             }
             }

-           }
+        }

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


@@ -431,11 +489,11 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();

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

             item->GetSizer()->DoSetMinSize( width, height );
             item->GetSizer()->DoSetMinSize( width, height );

-               return TRUE;
-           }
+            return TRUE;
+        }

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


@@ -443,15 +501,15 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*)node->Data();

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

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

             }
             }

-           }
+        }

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


@@ -471,7 +529,7 @@ bool wxSizer::DoSetItemMinSize( int pos, int width, int height )
     }
     else
     {
     }
     else
     {

-        /* ... whereas the minimal size of spacers and windows in stored 
+        /* ... whereas the minimal size of spacers and windows in stored

            in the item */
         item->SetInitSize( width, height );
     }
            in the item */
         item->SetInitSize( width, height );
     }


@@ -515,9 +573,9 @@ void wxGridSizer::RecalcSizes()
 
     wxSize sz( GetSize() );
     wxPoint pt( GetPosition() );
 
     wxSize sz( GetSize() );
     wxPoint pt( GetPosition() );

-    
-       int w = (sz.x - (ncols - 1) * m_hgap) / ncols;
-       int h = (sz.y - (nrows - 1) * m_vgap) / nrows;
+
+    int w = (sz.x - (ncols - 1) * m_hgap) / ncols;
+    int h = (sz.y - (nrows - 1) * m_vgap) / nrows;

 
     int x = pt.x;
     for (int c = 0; c < ncols; c++)
 
     int x = pt.x;
     for (int c = 0; c < ncols; c++)


@@ -530,7 +588,7 @@ void wxGridSizer::RecalcSizes()
             {
                 wxNode *node = m_children.Nth( i );
                 wxASSERT( node );
             {
                 wxNode *node = m_children.Nth( i );
                 wxASSERT( node );

-                
+

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


@@ -556,7 +614,7 @@ wxSize wxGridSizer::CalcMin()
     /* Find the max width and height for any component */
     int w = 0;
     int h = 0;
     /* Find the max width and height for any component */
     int w = 0;
     int h = 0;

-    
+

     wxNode *node = m_children.First();
     while (node)
     {
     wxNode *node = m_children.First();
     while (node)
     {


@@ -564,10 +622,10 @@ wxSize wxGridSizer::CalcMin()
         wxSize sz( item->CalcMin() );
         w = wxMax( w, sz.x );
         h = wxMax( h, sz.y );
         wxSize sz( item->CalcMin() );
         w = wxMax( w, sz.x );
         h = wxMax( h, sz.y );

-        
+

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

-    
+

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


@@ -592,7 +650,7 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
         {
             pt.x = x + (w - sz.x);
         }
         {
             pt.x = x + (w - sz.x);
         }

-        
+

         if (flag & wxALIGN_CENTER_VERTICAL)
         {
             pt.y = y + (h - sz.y) / 2;
         if (flag & wxALIGN_CENTER_VERTICAL)
         {
             pt.y = y + (h - sz.y) / 2;


@@ -602,7 +660,7 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
             pt.y = y + (h - sz.y);
         }
     }
             pt.y = y + (h - sz.y);
         }
     }

-    
+

     item->SetDimension(pt, sz);
 }
 
     item->SetDimension(pt, sz);
 }
 


@@ -612,18 +670,18 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
 
 wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
    : wxGridSizer( rows, cols, vgap, hgap )
 
 wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
    : wxGridSizer( rows, cols, vgap, hgap )

-{ 
+{

     m_rowHeights = (int*) NULL;
     m_colWidths = (int*) NULL;
 }
 
 wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap )
     m_rowHeights = (int*) NULL;
     m_colWidths = (int*) NULL;
 }
 
 wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap )

-   : wxGridSizer( cols, vgap, hgap ) 
-{ 
+   : wxGridSizer( cols, vgap, hgap )
+{

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

-       
+

 wxFlexGridSizer::~wxFlexGridSizer()
 {
     if (m_rowHeights)
 wxFlexGridSizer::~wxFlexGridSizer()
 {
     if (m_rowHeights)


@@ -638,10 +696,10 @@ void wxFlexGridSizer::CreateArrays()
         delete[] m_rowHeights;
     if (m_colWidths)
         delete[] m_colWidths;
         delete[] m_rowHeights;
     if (m_colWidths)
         delete[] m_colWidths;

-        
+

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

-        
+

     int nitems = m_children.GetCount();
     int nrows = m_rows;
     int ncols = m_cols;
     int nitems = m_children.GetCount();
     int nrows = m_rows;
     int ncols = m_cols;


@@ -653,7 +711,7 @@ void wxFlexGridSizer::CreateArrays()
 
     m_rowHeights = new int[nrows];
     m_colWidths = new int[ncols];
 
     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++)
     for (int col = 0; col < ncols; col++)
         m_colWidths[ col ] = 0;
     for (int row = 0; row < nrows; row++)


@@ -686,14 +744,14 @@ void wxFlexGridSizer::RecalcSizes()
         for (idx = 0; idx < m_growableRows.GetCount(); idx++)
             m_rowHeights[ m_growableRows[idx] ] += delta;
     }
         for (idx = 0; idx < m_growableRows.GetCount(); idx++)
             m_rowHeights[ m_growableRows[idx] ] += delta;
     }

-    
+

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

-    
+

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


@@ -707,10 +765,10 @@ void wxFlexGridSizer::RecalcSizes()
             {
                 wxNode *node = m_children.Nth( i );
                 wxASSERT( node );
             {
                 wxNode *node = m_children.Nth( i );
                 wxASSERT( 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);
             }
             y = y + m_rowHeights[r] + m_vgap;
                 SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h);
             }
             y = y + m_rowHeights[r] + m_vgap;


@@ -734,10 +792,10 @@ wxSize wxFlexGridSizer::CalcMin()
         ncols = (nitems + nrows-1) / nrows;
 
     CreateArrays();
         ncols = (nitems + nrows-1) / nrows;
 
     CreateArrays();

-    
+

     int col;
     int row;
     int col;
     int row;

-    
+

     int i = 0;
     wxNode *node = m_children.First();
     while (node)
     int i = 0;
     wxNode *node = m_children.First();
     while (node)


@@ -748,19 +806,19 @@ wxSize wxFlexGridSizer::CalcMin()
         col = i % ncols;
         m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] );
         m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] );
         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++;
     }
         node = node->Next();
         i++;
     }

-    
+

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

-    
+

     return wxSize( width +  (ncols-1) * m_hgap,
                    height + (nrows-1) * m_vgap);
 }
     return wxSize( width +  (ncols-1) * m_hgap,
                    height + (nrows-1) * m_vgap);
 }


@@ -770,7 +828,7 @@ void wxFlexGridSizer::AddGrowableRow( size_t idx )
     m_growableRows.Add( idx );
 }
 
     m_growableRows.Add( idx );
 }
 

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

 {
 }
 
 {
 }
 


@@ -779,7 +837,7 @@ void wxFlexGridSizer::AddGrowableCol( size_t idx )
     m_growableCols.Add( idx );
 }
 
     m_growableCols.Add( idx );
 }
 

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

 {
 }
 
 {
 }
 


@@ -805,12 +863,12 @@ void wxBoxSizer::RecalcSizes()
         {
             delta = (m_size.x - m_fixedWidth) / m_stretchable;
             extra = (m_size.x - m_fixedWidth) % m_stretchable;
         {
             delta = (m_size.x - m_fixedWidth) / m_stretchable;
             extra = (m_size.x - m_fixedWidth) % m_stretchable;

-           }
-           else
-           { 
+        }
+        else
+        {

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

-           }
+        }

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


@@ -820,64 +878,64 @@ void wxBoxSizer::RecalcSizes()
     {
         wxSizerItem *item = (wxSizerItem*) node->Data();
 
     {
         wxSizerItem *item = (wxSizerItem*) node->Data();
 

-           int weight = 1;
-           if (item->GetOption())
-               weight = item->GetOption();
-
-           wxSize size( item->CalcMin() );
-
-           if (m_orient == wxVERTICAL)
-           {
-               wxCoord height = size.y;
-               if (item->GetOption())
-               {
-                   height = (delta * weight) + extra;
-                       extra = 0; // only the first item will get the remainder as extra size
-               }
-
-               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())
-               {  
-                   width = (delta * weight) + extra;
-                       extra = 0; // only the first item will get the remainder as extra size
-               }
-
-               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();
+        int weight = 1;
+        if (item->GetOption())
+            weight = item->GetOption();
+
+        wxSize size( item->CalcMin() );
+
+        if (m_orient == wxVERTICAL)
+        {
+            wxCoord height = size.y;
+            if (item->GetOption())
+            {
+                height = (delta * weight) + extra;
+                extra = 0; // only the first item will get the remainder as extra size
+            }
+
+            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())
+            {
+                width = (delta * weight) + extra;
+                extra = 0; // only the first item will get the remainder as extra size
+            }
+
+            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();

     }
 }
 
     }
 }
 


@@ -892,47 +950,70 @@ wxSize wxBoxSizer::CalcMin()
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 

+    // Find how long each stretch unit needs to be
+    int stretchSize = 1;

     wxNode *node = m_children.GetFirst();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*) node->Data();
     wxNode *node = m_children.GetFirst();
     while (node)
     {
         wxSizerItem *item = (wxSizerItem*) node->Data();

+        if (item->GetOption() != 0)
+        {
+            int stretch = item->GetOption();
+            wxSize size( item->CalcMin() );
+            int sizePerStretch;
+            // Integer division rounded up is (a + b - 1) / b
+            if (m_orient == wxHORIZONTAL)
+                sizePerStretch = ( size.x + stretch - 1 ) / stretch;
+            else
+                sizePerStretch = ( size.y + stretch - 1 ) / stretch;
+            if (sizePerStretch > stretchSize)
+                stretchSize = sizePerStretch;
+        }
+        node = node->Next();
+    }
+       // Calculate overall minimum size
+       node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = (wxSizerItem*) node->Data();
+
+        m_stretchable += item->GetOption();
+
+        wxSize size( item->CalcMin() );
+        if (item->GetOption() != 0)
+        {
+            if (m_orient == wxHORIZONTAL)
+                size.x = stretchSize * item->GetOption();
+            else
+                size.y = stretchSize * item->GetOption();
+        }
+
+        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 );
+        }
+
+        if (item->GetOption() == 0)
+        {
+            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 );
+            }
+        }

 
 

-           int weight = 1;
-           if (item->GetOption())
-               weight = item->GetOption();
-
-           wxSize size( item->CalcMin() );
-
-           if (m_orient == wxHORIZONTAL)
-           {
-               m_minWidth += (size.x * weight);
-               m_minHeight = wxMax( m_minHeight, size.y );
-           }
-           else
-           {
-               m_minHeight += (size.y * weight);
-               m_minWidth = wxMax( m_minWidth, size.x );
-           }
-
-           if (item->GetOption())
-           {
-               m_stretchable += weight;
-           }
-           else
-           {
-               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();
+        node = node->Next();

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


@@ -942,22 +1023,35 @@ wxSize wxBoxSizer::CalcMin()
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 

+#if wxUSE_STATBOX
+

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

-  : wxBoxSizer( orient )
+                : wxBoxSizer( orient )

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

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

 void wxStaticBoxSizer::RecalcSizes()
 {
 void wxStaticBoxSizer::RecalcSizes()
 {

-    // this will have to be done platform by platform
-    // as there is no way to guess the thickness of
-    // a wxStaticBox border
-    int top_border = 15;
-    if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
-    int other_border = 5;
+    int top_border, other_border;
+    GetStaticBoxBorders(m_staticBox, &top_border, &other_border);

 
     m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
 
 
     m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
 


@@ -976,13 +1070,8 @@ void wxStaticBoxSizer::RecalcSizes()
 
 wxSize wxStaticBoxSizer::CalcMin()
 {
 
 wxSize wxStaticBoxSizer::CalcMin()
 {

-    // This will have to be done platform by platform
-    // as there is no way to guess the thickness of
-    // a wxStaticBox border.
-    
-    int top_border = 15;
-    if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
-    int other_border = 5;
+    int top_border, other_border;
+    GetStaticBoxBorders(m_staticBox, &top_border, &other_border);

 
     wxSize ret( wxBoxSizer::CalcMin() );
     ret.x += 2*other_border;
 
     wxSize ret( wxBoxSizer::CalcMin() );
     ret.x += 2*other_border;


@@ -991,6 +1080,8 @@ wxSize wxStaticBoxSizer::CalcMin()
     return ret;
 }
 
     return ret;
 }
 

+#endif // wxUSE_STATBOX
+

 //---------------------------------------------------------------------------
 // wxNotebookSizer
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxNotebookSizer
 //---------------------------------------------------------------------------


@@ -1000,7 +1091,7 @@ wxSize wxStaticBoxSizer::CalcMin()
 wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
 {
     wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
 wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
 {
     wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );

-    
+

     m_notebook = nb;
 }
 
     m_notebook = nb;
 }
 


@@ -1011,24 +1102,15 @@ void wxNotebookSizer::RecalcSizes()
 
 wxSize wxNotebookSizer::CalcMin()
 {
 
 wxSize wxNotebookSizer::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.
-    
-    int borderX = 5;
-    int borderY = 5;
-    if ((m_notebook->HasFlag(wxNB_RIGHT)) ||
-        (m_notebook->HasFlag(wxNB_LEFT)))
-    {
-        borderX += 90; // improvements later..
-    }
-    else
+    wxSize sizeBorder = m_notebook->CalcSizeFromPage(wxSize(0, 0));
+
+    sizeBorder.x += 5;
+    sizeBorder.y += 5;
+
+    if (m_notebook->GetChildren().GetCount() == 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;


@@ -1037,20 +1119,22 @@ wxSize wxNotebookSizer::CalcMin()
     while (node)
     {
         wxWindow *item = node->GetData();
     while (node)
     {
         wxWindow *item = node->GetData();

-           wxSizer *itemsizer = item->GetSizer();
-       
-           if (itemsizer)
-           {
+        wxSizer *itemsizer = item->GetSizer();
+
+        if (itemsizer)
+        {

             wxSize subsize( itemsizer->CalcMin() );
             wxSize subsize( itemsizer->CalcMin() );

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

 
 

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

     }
 
     }
 

-    return wxSize( borderX + maxX, borderY + maxY );
+    return wxSize( maxX, maxY ) + sizeBorder;

 }
 
 #endif // wxUSE_NOTEBOOK
 }
 
 #endif // wxUSE_NOTEBOOK