final (touch wood) tidy after things went pearshaped on line 666
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -633,7 +633,6 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
|
|||||||
szx, szy, // view size (total)
|
szx, szy, // view size (total)
|
||||||
clix, cliy; // view size (on screen)
|
clix, cliy; // view size (on screen)
|
||||||
|
|
||||||
int y;
|
|
||||||
ViewStart(&stx, &sty);
|
ViewStart(&stx, &sty);
|
||||||
GetClientSize(&clix, &cliy);
|
GetClientSize(&clix, &cliy);
|
||||||
GetVirtualSize(&szx, &szy);
|
GetVirtualSize(&szx, &szy);
|
||||||
@@ -659,12 +658,13 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
|
|||||||
szy = -1;
|
szy = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int dsty;
|
||||||
switch ( event.KeyCode() )
|
switch ( event.KeyCode() )
|
||||||
{
|
{
|
||||||
case WXK_PAGEUP:
|
case WXK_PAGEUP:
|
||||||
case WXK_PRIOR:
|
case WXK_PRIOR:
|
||||||
y = sty - (5 * cliy / 6);
|
dsty = sty - (5 * cliy / 6);
|
||||||
Scroll(-1, (y == -1) ? 0 : y);
|
Scroll(-1, (dsty == -1) ? 0 : dsty);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WXK_PAGEDOWN:
|
case WXK_PAGEDOWN:
|
||||||
|
Reference in New Issue
Block a user