added more specializations for bcc32

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 21f311e59b65958a5fe4f494d48c0e133843c870..87b68bee7606b5eb69e0db37d9ff06ebe2524806 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -43,7 +43,38 @@ IMPLEMENT_CLASS(wxNotebookSizer, wxSizer)
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 

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

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


@@ -94,10 +125,16 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
 
 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;

+    }

 }
 
 
 }
 
 


@@ -277,12 +314,11 @@ int wxSizerItem::GetOption() const
 wxSizer::wxSizer()
     : m_minSize( wxSize( 0, 0 ) )
 {
 wxSizer::wxSizer()
     : m_minSize( wxSize( 0, 0 ) )
 {

-    m_children.DeleteContents( true );

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

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

 }
 
 void wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
 }
 
 void wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData )


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

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

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

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

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


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

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

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


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

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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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

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


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

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

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

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

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


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

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

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


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

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

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


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

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

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


@@ -758,7 +806,7 @@ void wxSizer::Show( wxWindow *window, bool show )
 {
     wxASSERT_MSG( window, _T("Show for NULL window") );
 
 {
     wxASSERT_MSG( window, _T("Show for NULL window") );
 

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

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


@@ -776,7 +824,7 @@ void wxSizer::Show( wxSizer *sizer, bool show )
 {
     wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
 
 {
     wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
 

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

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


@@ -800,7 +848,7 @@ void wxSizer::Show( size_t index, bool show )
 
 void wxSizer::ShowItems( bool show )
 {
 
 void wxSizer::ShowItems( bool show )
 {

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

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


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

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

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


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

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

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


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

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

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


@@ -945,7 +993,7 @@ wxSize wxGridSizer::CalcMin()
     int w = 0;
     int h = 0;
 
     int w = 0;
     int h = 0;
 

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

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


@@ -1026,50 +1074,48 @@ void wxFlexGridSizer::RecalcSizes()
     wxSize sz( GetSize() );
     wxSize minsz( CalcMin() );
     wxPoint pt( GetPosition() );
     wxSize sz( GetSize() );
     wxSize minsz( CalcMin() );
     wxPoint pt( GetPosition() );

-    int    delta;
-    size_t idx, num;
-    wxArrayInt temp;
-    wxArrayInt temp_proportions;
-    int sum_proportions = 0;
-    int growable_space = 0;

 
     // what to do with the rows? by default, resize them proportionally
 
     // what to do with the rows? by default, resize them proportionally

-    if ( (m_flexDirection & wxVERTICAL) ||
-            (m_growMode == wxFLEX_GROWMODE_SPECIFIED) )
+    if ( sz.y > minsz.y && ( (m_flexDirection & wxVERTICAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )

     {
     {

-        // Transfer only those rows into temp which exist in the sizer
-        // ignoring the superfluous ones. This prevents a segfault when
-        // calling AddGrowableRow( 3 ) if the sizer only has 2 rows.
+        int sum_proportions = 0;
+        int growable_space = 0;
+        int num = 0;
+        size_t idx;

         for (idx = 0; idx < m_growableRows.GetCount(); idx++)
         {
         for (idx = 0; idx < m_growableRows.GetCount(); idx++)
         {

-            if (m_growableRows[idx] < nrows)
-            {
-                temp.Add( m_growableRows[idx] );
-                temp_proportions.Add( m_growableRowsProportions[idx] );
-                sum_proportions += m_growableRowsProportions[idx];
-                growable_space += m_rowHeights[ temp[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++;

         }
 
         }
 

-        num = temp.GetCount();
-
-        if ((num > 0) && (sz.y > minsz.y))
+        if (num > 0)

         {
         {

-            for (idx = 0; idx < num; idx++)
+            for (idx = 0; idx < m_growableRows.GetCount(); idx++)

             {
             {

-                delta = (sz.y - minsz.y);
-                if (sum_proportions == 0)
-                    delta = (delta/num) + m_rowHeights[ temp[idx] ];
+                if (m_growableRows[idx] >= nrows ) 
+                    continue;
+                if (m_rowHeights[ m_growableRows[idx] ] == -1) 
+                    m_rowHeights[ m_growableRows[idx] ] = 0;

                 else
                 else

-                    delta = ((delta+growable_space)*temp_proportions[idx])/
-                                                     sum_proportions;
-                m_rowHeights[ temp[idx] ] = delta;
+                {
+                    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;
+                }

             }
         }
             }
         }

-        temp.Empty();
-        temp_proportions.Empty();
-               sum_proportions = 0;
-               growable_space = 0;

     }
     else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) )
     {
     }
     else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) )
     {


@@ -1079,34 +1125,45 @@ void wxFlexGridSizer::RecalcSizes()
     }
 
     // the same logic as above but for the columns
     }
 
     // the same logic as above but for the columns

-    if ( (m_flexDirection & wxHORIZONTAL) ||
-            (m_growMode == wxFLEX_GROWMODE_SPECIFIED) )
+    if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )

     {
     {

-        // See above
+        int sum_proportions = 0;
+        int growable_space = 0;
+        int num = 0;
+        size_t idx;

         for (idx = 0; idx < m_growableCols.GetCount(); idx++)
         {
         for (idx = 0; idx < m_growableCols.GetCount(); idx++)
         {

-            if (m_growableCols[idx] < ncols)
-            {
-                temp.Add( m_growableCols[idx] );
-                temp_proportions.Add( m_growableColsProportions[idx] );
-                sum_proportions += m_growableColsProportions[idx];
-                growable_space += m_colWidths[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++;

         }
 
         }
 

-        num = temp.GetCount();
-
-        if ((num > 0) && (sz.x > minsz.x))
+        if (num > 0)

         {
         {

-            for (idx = 0; idx < num; idx++)
+            for (idx = 0; idx < m_growableCols.GetCount(); idx++)

             {
             {

-                delta = (sz.x - minsz.x);
-                if (sum_proportions == 0)
-                    delta = (delta/num) + m_colWidths[ temp[idx] ];
-               else
-                    delta = ((delta+growable_space)*temp_proportions[idx])/
-                                                     sum_proportions;
-                m_colWidths[ temp[idx] ] = delta;
+                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;
+                }

             }
         }
     }
             }
         }
     }


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

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

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


@@ -1148,34 +1205,37 @@ wxSize wxFlexGridSizer::CalcMin()
             ncols;
     size_t  i, s;
 
             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);
 
     if ( !CalcRowsCols(nrows, ncols) )
         return wxSize(10, 10);
 

-    // We have to clear the old sizes out if any item has wxADJUST_MINSIZE
-    // set on it.  Its probably quicker to just always do it than test for
-    // that though.  At least do it before resizing the arrays, SetCount will
-    // initialise new elements to zero.
-    for( s = m_rowHeights.GetCount(), i = 0; i < s; ++i )
-        m_rowHeights[ i ] = 0;
-
-    for( s = m_colWidths.GetCount(), i = 0; i < s; ++i )
-        m_colWidths[ i ] = 0;
-

     m_rowHeights.SetCount(nrows);
     m_colWidths.SetCount(ncols);
 
     m_rowHeights.SetCount(nrows);
     m_colWidths.SetCount(ncols);
 

-    wxSizerItemList::Node   *node = m_children.GetFirst();
+    // 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.
+    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();
 
     i = 0;
     while (node)
     {
         wxSizerItem    *item = node->GetData();

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

 
 

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

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


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

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

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


@@ -1208,17 +1267,19 @@ wxSize wxFlexGridSizer::CalcMin()
         }
     }
 
         }
     }
 

-
+    // 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++)
     int width = 0;
     for (int col = 0; col < ncols; col++)

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

-        height += m_rowHeights[ row ];
+        if ( m_rowHeights[ row ] != -1 )
+            height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );

 
 

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

 }
 
 void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
 }
 
 void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )


@@ -1273,7 +1334,7 @@ void wxBoxSizer::RecalcSizes()
 
     wxPoint pt( m_position );
 
 
     wxPoint pt( m_position );
 

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

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


@@ -1355,7 +1416,7 @@ wxSize wxBoxSizer::CalcMin()
 
     // Find how long each stretch unit needs to be
     int                      stretchSize = 1;
 
     // Find how long each stretch unit needs to be
     int                      stretchSize = 1;

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

 
     while (node)
     {
 
     while (node)
     {


@@ -1526,7 +1587,7 @@ wxSize wxNotebookSizer::CalcMin()
     int maxX = 0;
     int maxY = 0;
 
     int maxX = 0;
     int maxY = 0;
 

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

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