don't use deprecated toolbar API

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

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index 530417aca39dc84bd630f1efac547552cd2054c2..50bb4c1c6d1785eb567cc2bd951faa59580e8f6a 100644 (file)
--- 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
 // 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 <vadim@wxwindows.org>
 // Created:     30.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>


@@ -157,6 +157,7 @@ wxVarScrollHelperBase::wxVarScrollHelperBase(wxWindow *win)
     m_win =
     m_targetWindow = (wxWindow *)NULL;
 
     m_win =
     m_targetWindow = (wxWindow *)NULL;
 

+    m_physicalScrolling = true;

     m_handler = NULL;
 
     m_win = win;
     m_handler = NULL;
 
     m_win = win;


@@ -591,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
     // 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
     {
         // the simplest case: we don't have any old units left, just redraw
         // everything


@@ -600,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);