missing include for memoryDC

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 6230cb10d3865d3f71a1d566a138399b07649da9..9800febda5bb4ef5452191f8c034dfb8b714c22b 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -748,6 +748,7 @@ void wxWindowMac::Init()
 #if wxMAC_USE_CORE_GRAPHICS
     m_cgContextRef = NULL ;
 #endif
+    m_clipChildren = false ;
     // we need a valid font for the encodings
     wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 }
@@ -2428,10 +2429,12 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 #else
             // this would be the preferred version for fast drawing controls
 
-            if( UMAGetSystemVersion() < 0x1030 || !m_peer->IsCompositing() )
-                Update() ;
-            else
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+            if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
                 HIViewRender(m_peer->GetControlRef()) ;
+            else
+#endif
+                Update() ;
 #endif
         }
         // as the native control might be not a 0/0 wx window coordinates, we have to offset
@@ -2446,10 +2449,13 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 #else
         // this would be the preferred version for fast drawing controls       
 
-        if( UMAGetSystemVersion() < 0x1030 || !m_peer->IsCompositing()  )
-            Update() ;
-        else
-            HIViewRender(m_peer->GetControlRef()) ;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+            if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
+                HIViewRender(m_peer->GetControlRef()) ;
+            else
+#endif
+                Update() ;
+
 #endif
        }
        else