X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9845ffceccfd024109a88fd1d959ebd64a209782..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/generic/vscroll.cpp?ds=sidebyside

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index de9cf1fa61..50bb4c1c6d 100644
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -592,8 +592,8 @@ bool wxVarScrollHelperBase::DoScrollToUnit(size_t unit)
     // finally refresh the display -- but only redraw as few units as possible
     // to avoid flicker.  We can't do this if we have children because they
     // won't be scrolled
-    if ( m_targetWindow->GetChildren().empty() &&
-         GetVisibleBegin() >= unitLastOld || GetVisibleEnd() <= unitFirstOld )
+    if ( (m_targetWindow->GetChildren().empty() &&
+         GetVisibleBegin() >= unitLastOld) || GetVisibleEnd() <= unitFirstOld )
     {
         // the simplest case: we don't have any old units left, just redraw
         // everything
@@ -601,7 +601,12 @@ bool wxVarScrollHelperBase::DoScrollToUnit(size_t unit)
     }
     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 )
+#endif
         {
             wxCoord dx = 0,
                     dy = GetUnitsSize(GetVisibleBegin(), unitFirstOld);