fixed typo : _ instead of wxT

[wxWidgets.git] / src / generic / scrolwin.cpp

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 02519f2359c96d14c1ab058c74f82859cb2361be..1a8af0154780f89b361827a302df0e499aae5ebc 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -110,8 +110,14 @@ bool wxScrolledWindow::Create(wxWindow *parent,
 
     m_targetWindow = this;
 
 
     m_targetWindow = this;
 

-    // we need wxWANTS_CHARS to process arrows ourselves
-    return wxPanel::Create(parent, id, pos, size, style | wxWANTS_CHARS, name);
+    bool ok = wxPanel::Create(parent, id, pos, size, style, name);
+
+#ifdef __WXMSW__
+    // we need to process arrows ourselves for scrolling
+    m_lDlgCode |= DLGC_WANTARROWS;
+#endif // __WXMSW__
+
+    return ok;

 }
 
 wxScrolledWindow::~wxScrolledWindow()
 }
 
 wxScrolledWindow::~wxScrolledWindow()


@@ -513,7 +519,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
     int w, h;
     m_targetWindow->GetClientSize(&w, &h);
 
     int w, h;
     m_targetWindow->GetClientSize(&w, &h);
 

-    if (x_pos != -1)
+    if ((x_pos != -1) && (m_xScrollPixelsPerLine))

     {
         int old_x = m_xScrollPosition;
         m_xScrollPosition = x_pos;
     {
         int old_x = m_xScrollPosition;
         m_xScrollPosition = x_pos;


@@ -533,7 +539,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
         m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
         m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
     }
         m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
         m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
     }

-    if (y_pos != -1)
+    if ((y_pos != -1) && (m_yScrollPixelsPerLine))

     {
         int old_y = m_yScrollPosition;
         m_yScrollPosition = y_pos;
     {
         int old_y = m_yScrollPosition;
         m_yScrollPosition = y_pos;


@@ -633,7 +639,6 @@ 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);


@@ -641,12 +646,12 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
     if( m_xScrollPixelsPerLine )
     {
         clix /= m_xScrollPixelsPerLine;
     if( m_xScrollPixelsPerLine )
     {
         clix /= m_xScrollPixelsPerLine;

-       szx /= m_xScrollPixelsPerLine;
+        szx /= m_xScrollPixelsPerLine;

     }
     else
     {
         clix = 0;
     }
     else
     {
         clix = 0;

-       szx = -1;
+        szx = -1;

     }
     if( m_yScrollPixelsPerLine )
     {
     }
     if( m_yScrollPixelsPerLine )
     {


@@ -656,15 +661,16 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
     else
     {
         cliy = 0;
     else
     {
         cliy = 0;

-       szy = -1;
+        szy = -1;

     }
 
     }
 

+    int dsty;

     switch ( event.KeyCode() )
     {
         case WXK_PAGEUP:
         case WXK_PRIOR:
     switch ( event.KeyCode() )
     {
         case WXK_PAGEUP:
         case WXK_PRIOR:

-            y = sty - (5 * cliy / 6);
-            Scroll(-1, (y == -1) ? 0 : y);
+            dsty = sty - (5 * cliy / 6);
+            Scroll(-1, (dsty == -1) ? 0 : dsty);

             break;
 
         case WXK_PAGEDOWN:
             break;
 
         case WXK_PAGEDOWN: