verify that we don't have more items than our number of rows/columns allows (See #10294)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
53ddede8da
commit
2283800b2e
@ -1328,9 +1328,12 @@ int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
|
||||
if ( m_cols && m_rows )
|
||||
{
|
||||
// if both rows and columns are specified by user, use the provided
|
||||
// values even if we don't have enough items
|
||||
// values even if we don't have enough items but check that we don't
|
||||
// have too many of them as this is going to result in problems later
|
||||
ncols = m_cols;
|
||||
nrows = m_rows;
|
||||
|
||||
wxASSERT_MSG( ncols*nrows <= nitems, "too many items in grid sizer" );
|
||||
}
|
||||
else if ( m_cols )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user