X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..ccc3a25d878ae0797c2f689f5ef6a8b727786f83:/src/common/gbsizer.cpp diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp index 7369b1b145..66c27e8299 100644 --- a/src/common/gbsizer.cpp +++ b/src/common/gbsizer.cpp @@ -583,7 +583,7 @@ void wxGridBagSizer::RecalcSizes() void wxGridBagSizer::AdjustForOverflow() { int row, col; - + for (row=0; row<(int)m_rowHeights.GetCount(); row++) { int rowExtra=INT_MAX; @@ -597,7 +597,7 @@ void wxGridBagSizer::AdjustForOverflow() int endrow, endcol; item->GetEndPos(endrow, endcol); - + // If the item starts in this position and doesn't span rows, then // just look at the whole item height if ( item->GetPos() == pos && endrow == row ) @@ -617,7 +617,7 @@ void wxGridBagSizer::AdjustForOverflow() if ( itemHeight < 0 ) itemHeight = 0; - + // and check how much is left rowExtra = wxMin(rowExtra, rowHeight - itemHeight); } @@ -640,7 +640,7 @@ void wxGridBagSizer::AdjustForOverflow() int endrow, endcol; item->GetEndPos(endrow, endcol); - + if ( item->GetPos() == pos && endcol == col ) { int itemWidth = item->CalcMin().GetWidth(); @@ -656,7 +656,7 @@ void wxGridBagSizer::AdjustForOverflow() if ( itemWidth < 0 ) itemWidth = 0; - + colExtra = wxMin(colExtra, colWidth - itemWidth); } } @@ -664,7 +664,7 @@ void wxGridBagSizer::AdjustForOverflow() m_colWidths[col] -= colExtra; } - + } //---------------------------------------------------------------------------