Don't optimize if there are child windows

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

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 984bcad7f588f1946f3384895e6d38bc2d01bee9..717187207d78eb3395d732d1b73aac93c983917d 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -41,6 +41,10 @@
     #include "wx/sizer.h"
 #endif
 
     #include "wx/sizer.h"
 #endif
 

+#ifdef __WXMAC__
+#include "wx/scrolbar.h"
+#endif
+

 #include "wx/recguard.h"
 
 #ifdef __WXMSW__
 #include "wx/recguard.h"
 
 #ifdef __WXMSW__


@@ -464,6 +468,22 @@ wxWindow *wxScrollHelper::GetTargetWindow() const
     return m_targetWindow;
 }
 
     return m_targetWindow;
 }
 

+#ifdef __WXMAC__
+static bool wxScrolledWindowHasChildren(wxWindow* win)
+{
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow* child = node->GetData();
+        if ( !child->IsKindOf(CLASSINFO(wxScrollBar)) )
+            return true;
+
+        node = node->GetNext();
+    }
+    return false;
+}
+#endif
+

 // ----------------------------------------------------------------------------
 // scrolling implementation itself
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // scrolling implementation itself
 // ----------------------------------------------------------------------------


@@ -482,7 +502,8 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
     bool needsRefresh = false;
 #ifdef __WXMAC__
     // OS X blocks on immediate redraws, so make this a refresh
     bool needsRefresh = false;
 #ifdef __WXMAC__
     // OS X blocks on immediate redraws, so make this a refresh

-    needsRefresh = true;
+    if (!wxScrolledWindowHasChildren(m_targetWindow))
+      needsRefresh = true;

 #endif
     int dx = 0,
         dy = 0;
 #endif
     int dx = 0,
         dy = 0;