Fixed the fix of the fix so it will compile under VC6

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index e6afcadfb60cc7ec34b65448583868da3b135584..02519f2359c96d14c1ab058c74f82859cb2361be 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -633,6 +633,7 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
         szx, szy,       // view size (total)
         clix, cliy;     // view size (on screen)
 
         szx, szy,       // view size (total)
         clix, cliy;     // view size (on screen)
 

+    int y;

     ViewStart(&stx, &sty);
     GetClientSize(&clix, &cliy);
     GetVirtualSize(&szx, &szy);
     ViewStart(&stx, &sty);
     GetClientSize(&clix, &cliy);
     GetVirtualSize(&szx, &szy);


@@ -662,7 +663,7 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
     {
         case WXK_PAGEUP:
         case WXK_PRIOR:
     {
         case WXK_PAGEUP:
         case WXK_PRIOR:

-            int y = sty - (5 * cliy / 6);
+            y = sty - (5 * cliy / 6);

             Scroll(-1, (y == -1) ? 0 : y);
             break;
 
             Scroll(-1, (y == -1) ? 0 : y);
             break;