cleanup

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 396de9fd3495a1b4e786daae1345fe9147ddc312..bf8fec7c7624516c24c5dc25336f22edf7624780 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -201,7 +201,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 RgnHandle updateRgn = NULL ;
                 RgnHandle allocatedRgn = NULL ;
                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
                 RgnHandle updateRgn = NULL ;
                 RgnHandle allocatedRgn = NULL ;
                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;

-                if ( thisWindow->MacGetTopLevelWindow()->MacUsesCompositing() == false || cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
+                if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )

                 {
                     updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
                 }
                 {
                     updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
                 }


@@ -2199,9 +2199,11 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
     bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ;
 //    if ( isCompositing )
     {
     bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ;
 //    if ( isCompositing )
     {

+#ifdef __WXMAC_OSX__

         if ( rect == NULL && isCompositing )
             m_peer->SetNeedsDisplay( true ) ;
         else
         if ( rect == NULL && isCompositing )
             m_peer->SetNeedsDisplay( true ) ;
         else

+#endif

         {
             
             Rect controlBounds ; 
         {
             
             Rect controlBounds ;