Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 5a300a0f9fd3d21779e92e1f639be32eacc69e9b..071ee210399dd61bff052261de581b394e3ba23e 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1820,15 +1820,28 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
     }
 }
 
     }
 }
 

+bool wxFlexGridSizer::IsRowGrowable( size_t idx )
+{
+    return m_growableRows.Index( idx ) != wxNOT_FOUND;
+}
+
+bool wxFlexGridSizer::IsColGrowable( size_t idx )
+{
+    return m_growableCols.Index( idx ) != wxNOT_FOUND;
+}

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

+    wxASSERT_MSG( !IsRowGrowable( idx ), 
+                  "AddGrowableRow() called for growable row" );

     m_growableRows.Add( idx );
     m_growableRowsProportions.Add( proportion );
 }
 
 void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
 {
     m_growableRows.Add( idx );
     m_growableRowsProportions.Add( proportion );
 }
 
 void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
 {

+    wxASSERT_MSG( !IsColGrowable( idx ), 
+                  "AddGrowableCol() called for growable column" );

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