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

Applied patch [ 863936 ] wxGrid scroll bars not drawn.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-01-08 15:52:35 +00:00
parent b1781a3c47
commit cd03160244
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/changes.txt
View File

@@ -193,6 +193,8 @@ All (GUI):
Generic: Generic:
- file dialog and directory dialog now support drive letters on OS/2 - file dialog and directory dialog now support drive letters on OS/2
- fixed scrollbar problem in wxGrid (not showing scrollbars
when sizing smaller) (Shane Harper)
Unix: Unix:
@@ -202,6 +204,11 @@ wxMSW:
- strip ampersands from strings returned by wxMenuBar::GetLabelTop() - strip ampersands from strings returned by wxMenuBar::GetLabelTop()
- fixed bug in wxIniConfig::DeleteEntry() (Parinya Thipchart) - fixed bug in wxIniConfig::DeleteEntry() (Parinya Thipchart)
- wxLongLong formatting with MinGW corrected
wxGTK:
- allow calling wxWindow::SetFont if window not yet created
wxOS2: wxOS2:
- fixed various problems in file handling - fixed various problems in file handling
@@ -210,7 +217,6 @@ wxOS2:
- partly fixed wxMouseEvent (reversed coordinate system again, handling of - partly fixed wxMouseEvent (reversed coordinate system again, handling of
CTRL and SHIFT keys. ALT still doesn't work as expected by wxWindows, though) CTRL and SHIFT keys. ALT still doesn't work as expected by wxWindows, though)
2.4.2 2.4.2
----- -----

27
src/generic/grid.cpp
View File

@@ -4090,28 +4090,11 @@ void wxGrid::CalcDimensions()
int x, y; int x, y;
GetViewStart( &x, &y ); GetViewStart( &x, &y );
// maybe we don't need scrollbars at all? // ensure the position is valid for the new scroll ranges
// if ( x >= w )
// also adjust the position to be valid for the new scroll rangs x = wxMax( w - 1, 0 );
if ( w <= cw ) if ( y >= h )
{ y = wxMax( h - 1, 0 );
w = x = 0;
}
else
{
if ( x >= w )
x = w - 1;
}
if ( h <= ch )
{
h = y = 0;
}
else
{
if ( y >= h )
y = h - 1;
}
// do set scrollbar parameters // do set scrollbar parameters
SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y, SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y,