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

ensure that wxGrid::AutoSizeColumn/Row() never sets column/row size smaller than the minimal size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-11-24 17:53:06 +00:00
parent 1abfa172c5
commit a01cfc082f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/grid.cpp
View File

@@ -10537,6 +10537,12 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
if ( column ) if ( column )
{ {
// Ensure automatic width is not less than minimal width. See the
// comment in SetColSize() for explanation of why this isn't done
// in SetColSize().
if ( !setAsMin )
extentMax = wxMax(extentMax, GetColMinimalWidth(col));
SetColSize( col, extentMax ); SetColSize( col, extentMax );
if ( !GetBatchCount() ) if ( !GetBatchCount() )
{ {
@@ -10552,6 +10558,12 @@ wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
} }
else else
{ {
// Ensure automatic width is not less than minimal height. See the
// comment in SetColSize() for explanation of why this isn't done
// in SetRowSize().
if ( !setAsMin )
extentMax = wxMax(extentMax, GetRowMinimalHeight(row));
SetRowSize(row, extentMax); SetRowSize(row, extentMax);
if ( !GetBatchCount() ) if ( !GetBatchCount() )
{ {