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

Applied patch [ 609516 ] AutoSize does not remove scrollbars

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-10-02 13:38:50 +00:00
parent fe3f379193
commit 6397b59b65
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/grid.cpp
View File

@@ -9285,12 +9285,15 @@ void wxGrid::AutoSize()
// round up the size to a multiple of scroll step - this ensures that we // round up the size to a multiple of scroll step - this ensures that we
// won't get the scrollbars if we're sized exactly to this width // won't get the scrollbars if we're sized exactly to this width
wxSize sizeFit(GetScrollX(size.x) * GRID_SCROLL_LINE_X, // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary
GetScrollY(size.y) * GRID_SCROLL_LINE_Y); // scrollbar steps
wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X,
GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y);
// distribute the extra space between teh columns/rows to avoid having // distribute the extra space between teh columns/rows to avoid having
// extra white space // extra white space
wxCoord diff = sizeFit.x - size.x; // Remove the extra m_extraWidth + 1 added above
wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1);
if ( diff ) if ( diff )
{ {
// try to resize the columns uniformly // try to resize the columns uniformly
@@ -9315,7 +9318,7 @@ void wxGrid::AutoSize()
} }
// same for rows // same for rows
diff = sizeFit.y - size.y; diff = sizeFit.y - size.y - (m_extraHeight + 1);
if ( diff ) if ( diff )
{ {
// try to resize the columns uniformly // try to resize the columns uniformly