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

deal correctly with having too few items in wxFlexGridSizer (this is not an error, more items could be added later): don't crash and don't assert

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-05-25 01:19:17 +00:00
parent f4f963f4a5
commit cc67d082f7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/sizer.cpp
View File

@ -1352,6 +1352,8 @@ void wxFlexGridSizer::RecalcSizes()
AdjustForGrowables(sz);
wxSizerItemList::const_iterator i = m_children.begin();
const wxSizerItemList::const_iterator end = m_children.end();
int y = 0;
for ( int r = 0; r < nrows; r++ )
{
@ -1359,7 +1361,12 @@ void wxFlexGridSizer::RecalcSizes()
{
// this row is entirely hidden, skip it
for ( int c = 0; c < ncols; c++ )
{
if ( i == end )
return;
++i;
}
continue;
}
@ -1370,22 +1377,13 @@ void wxFlexGridSizer::RecalcSizes()
h = hrow;
int x = 0;
for ( int c = 0; c < ncols; c++, ++i )
for ( int c = 0; c < ncols && i != end; c++, ++i )
{
const int wcol = m_colWidths[c];
if ( wcol == -1 )
continue;
// check if there are any remaining children: it may happen that
// the last row is incomplete
if ( i == m_children.end() )
{
wxASSERT_MSG( r == nrows - 1, _T("too few items") );
return;
}
int w = sz.x - x; // max possible value, ensure we don't overflow
if ( wcol < w )
w = wcol;
@ -1395,6 +1393,9 @@ void wxFlexGridSizer::RecalcSizes()
x += wcol + m_hgap;
}
if ( i == end )
return;
y += hrow + m_vgap;
}
}