Avoid scrolling parts of the screen that don't belong to us

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

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index de9cf1fa61c34cce367494781b1a72829621098e..a948519a9aa731cfe20d4b5cc425c890eaf463e4 100644 (file)
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -601,7 +601,12 @@ bool wxVarScrollHelperBase::DoScrollToUnit(size_t unit)
     }
     else // scroll the window
     {
     }
     else // scroll the window
     {

+        // Avoid scrolling visible parts of the screen on Mac
+#ifdef __WXMAC__
+        if (m_physicalScrolling && m_targetWindow->IsShownOnScreen())
+#else

         if ( m_physicalScrolling )
         if ( m_physicalScrolling )

+#endif

         {
             wxCoord dx = 0,
                     dy = GetUnitsSize(GetVisibleBegin(), unitFirstOld);
         {
             wxCoord dx = 0,
                     dy = GetUnitsSize(GetVisibleBegin(), unitFirstOld);