X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b573fb839d791af52be6c7edb8d51c4b58962b8..3c4e4af64e63b096f5f58fd2482b48dc4725e841:/src/mac/carbon/window.cpp?ds=sidebyside

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 184148f5f3..06d75e4611 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -24,7 +24,6 @@
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/scrolbar.h"
-#include "wx/scrolwin.h"
 #include "wx/statbox.h"
 #include "wx/button.h"
 #include "wx/settings.h"
@@ -37,8 +36,6 @@
 #include "wx/log.h"
 #include "wx/geometry.h"
 #include "wx/textctrl.h"
-#include "wx/laywin.h"
-#include "wx/splitter.h"
 
 #include "wx/toolbar.h"
 #include "wx/dc.h"
@@ -2489,7 +2486,7 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event )
 }
 
 // Get the window with the focus
-wxWindowMac *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::DoFindFocus()
 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
@@ -2624,8 +2621,10 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 void wxWindowMac::Update()
 {
 #if TARGET_API_MAC_OSX
-    WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ;
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+    WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ;
+
     // for composited windows this also triggers a redraw of all
     // invalid views in the window
     if( UMAGetSystemVersion() >= 0x1030 )
@@ -2730,9 +2729,8 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
                 MacRootWindowToWindow( &x , &y ) ;
 
                 if ( !includeOuterStructures || (
-                    parent->IsKindOf( CLASSINFO( wxScrolledWindow ) ) ||
-                    parent->IsKindOf( CLASSINFO( wxSashLayoutWindow ) ) ||
-                    ( parent->GetParent() && parent->GetParent()->IsKindOf( CLASSINFO( wxSplitterWindow ) ) )
+                    parent->MacClipChildren() ||
+                    ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() )
                     ) )
                 {
                     SetRectRgn( tempRgn ,