X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf4a8b2698fb853ac4b638d08d95cc8e5794d1aa..a85ad1db05e7d940383fdf75671f1aa69dacbb42:/src/generic/vscroll.cpp diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index 530417aca3..a948519a9a 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -2,7 +2,7 @@ // Name: src/generic/vscroll.cpp // Purpose: wxVScrolledWindow implementation // Author: Vadim Zeitlin -// Modified by: Brad Anderson +// Modified by: Brad Anderson, David Warkentin // Created: 30.05.03 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin @@ -157,6 +157,7 @@ wxVarScrollHelperBase::wxVarScrollHelperBase(wxWindow *win) m_win = m_targetWindow = (wxWindow *)NULL; + m_physicalScrolling = true; m_handler = NULL; m_win = win; @@ -600,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);