Make wxComboBox spit out a bit fewer surplis

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 184148f5f315fc0b71c20f7b1722a2a80c061d54..06d75e461139b50163649fe4a33a65a48ea9ef0f 100644 (file)
--- 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/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"
 #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/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"
 
 #include "wx/toolbar.h"
 #include "wx/dc.h"


@@ -2489,7 +2486,7 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event )
 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus

-wxWindowMac *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::DoFindFocus()

 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;


@@ -2624,8 +2621,10 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 void wxWindowMac::Update()
 {
 #if TARGET_API_MAC_OSX
 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
 #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 )
     // 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 || (
                 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 ,
                     ) )
                 {
                     SetRectRgn( tempRgn ,