X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7da975624b24ca0b243e9e70974ecaf9047c50a..f5ba273ecd799f652736ce2bc830283787302a56:/src/generic/scrolwin.cpp?ds=inline

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 3de943ec7c..1a8af01547 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -519,7 +519,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
     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;
@@ -539,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 );
     }
-    if (y_pos != -1)
+    if ((y_pos != -1) && (m_yScrollPixelsPerLine))
     {
         int old_y = m_yScrollPosition;
         m_yScrollPosition = y_pos;