Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct the check added in r57175 to use dynamically computed numbers of rows/columns

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-08 08:39:13 +00:00
parent 0c02fc7765
commit 324dc1f2d8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/sizer.cpp
View File

@@ -1830,7 +1830,10 @@ bool wxFlexGridSizer::IsColGrowable( size_t idx )
void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion ) void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
{ {
wxCHECK_RET( idx < (size_t)GetRows(), "invalid row index" ); int nrows, ncols;
CalcRowsCols(nrows, ncols);
wxCHECK_RET( idx < (size_t)nrows, "invalid row index" );
wxASSERT_MSG( !IsRowGrowable( idx ), wxASSERT_MSG( !IsRowGrowable( idx ),
"AddGrowableRow() called for growable row" ); "AddGrowableRow() called for growable row" );
m_growableRows.Add( idx ); m_growableRows.Add( idx );
@@ -1839,7 +1842,10 @@ void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion ) void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
{ {
wxCHECK_RET( idx < (size_t)GetCols(), "invalid column index" ); int nrows, ncols;
CalcRowsCols(nrows, ncols);
wxCHECK_RET( idx < (size_t)ncols, "invalid column index" );
wxASSERT_MSG( !IsColGrowable( idx ), wxASSERT_MSG( !IsColGrowable( idx ),
"AddGrowableCol() called for growable column" ); "AddGrowableCol() called for growable column" );
m_growableCols.Add( idx ); m_growableCols.Add( idx );