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

don't compute the columns/rows from the number of items if both were explicitly set by user

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-13 12:26:27 +00:00
parent cd68daf58a
commit 5fa51d09eb
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/sizer.cpp
View File

@@ -1324,10 +1324,17 @@ wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
{ {
int nitems = m_children.GetCount(); const int nitems = m_children.GetCount();
if ( nitems) if ( nitems )
{ {
if ( m_cols ) 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
ncols = m_cols;
nrows = m_rows;
}
else if ( m_cols )
{ {
ncols = m_cols; ncols = m_cols;
nrows = (nitems + m_cols - 1) / m_cols; nrows = (nitems + m_cols - 1) / m_cols;
@@ -1341,7 +1348,8 @@ int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
{ {
wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") ); wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") );
nrows = ncols = 0; nrows =
ncols = 0;
} }
} }