Update and improve "Hello world" example in the documentation.

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 783bfe1b3907970ec8e26fcb3a705a7d14c13061..129191551563cdc12b2d00fe4bb7bb20bfce4e05 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -840,6 +840,10 @@ bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
 
     wxSizerItem *item = node->GetData();
     node->SetData(newitem);
 
     wxSizerItem *item = node->GetData();
     node->SetData(newitem);

+
+    if (item->IsWindow() && item->GetWindow())
+        item->GetWindow()->SetContainingSizer(NULL);
+

     delete item;
 
     return true;
     delete item;
 
     return true;


@@ -1931,7 +1935,7 @@ void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
     // common) case when the number of rows was not specified in the ctor -- in
     // this case it will be computed only later, when all items are added to
     // the sizer, and the check will be done in AdjustForGrowables()
     // common) case when the number of rows was not specified in the ctor -- in
     // this case it will be computed only later, when all items are added to
     // the sizer, and the check will be done in AdjustForGrowables()

-    // wxCHECK_RET( !m_rows || idx < (size_t)m_rows, "invalid row index" );
+    wxCHECK_RET( !m_rows || idx < (size_t)m_rows, "invalid row index" );

 
     m_growableRows.Add( idx );
     m_growableRowsProportions.Add( proportion );
 
     m_growableRows.Add( idx );
     m_growableRowsProportions.Add( proportion );


@@ -1944,7 +1948,7 @@ void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
 
     // see comment in AddGrowableRow(): although it's less common to omit the
     // specification of the number of columns, it still can also happen
 
     // see comment in AddGrowableRow(): although it's less common to omit the
     // specification of the number of columns, it still can also happen

-    // wxCHECK_RET( !m_cols || idx < (size_t)m_cols, "invalid column index" );
+    wxCHECK_RET( !m_cols || idx < (size_t)m_cols, "invalid column index" );

 
     m_growableCols.Add( idx );
     m_growableColsProportions.Add( proportion );
 
     m_growableCols.Add( idx );
     m_growableColsProportions.Add( proportion );