removed unnecessary ClipRect calls, refresh on MacActivate with eraseBkgnd false

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 3a5cfcd895c14d3c66ffcdce024049d65c746f87..f44503d55587d5668228fae5ffa7db323e37107c 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -643,7 +643,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                        if ( focus.Ok() )
                        {
                                Rect clientrect = { 0 , 0 , m_height , m_width } ;
                        if ( focus.Ok() )
                        {
                                Rect clientrect = { 0 , 0 , m_height , m_width } ;

-                               ClipRect( &clientrect ) ;
+                               // ClipRect( &clientrect ) ;

                        InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                        }
                }
                        InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                        }
                }


@@ -678,7 +678,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                                if ( focus.Ok() )
                                {
                                        Rect clientrect = { 0 , 0 , m_height , m_width } ;
                                if ( focus.Ok() )
                                {
                                        Rect clientrect = { 0 , 0 , m_height , m_width } ;

-                                       ClipRect( &clientrect ) ;
+                                       // ClipRect( &clientrect ) ;

                                InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                                }
                        }
                                InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                                }
                        }


@@ -916,7 +916,7 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
        if ( focus.Ok() )
        {
                Rect clientrect = { 0 , 0 , m_height , m_width } ;
        if ( focus.Ok() )
        {
                Rect clientrect = { 0 , 0 , m_height , m_width } ;

-               ClipRect( &clientrect ) ;
+               // ClipRect( &clientrect ) ;

 
        if ( rect )
        {
 
        if ( rect )
        {


@@ -1795,7 +1795,7 @@ void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
        
        GetEventHandler()->ProcessEvent(event);
        
        
        GetEventHandler()->ProcessEvent(event);
        

-    Refresh() ;
+    Refresh(false) ;

        UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
 //     MacUpdateImmediately() ;
 }
        UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
 //     MacUpdateImmediately() ;
 }

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 3a5cfcd895c14d3c66ffcdce024049d65c746f87..f44503d55587d5668228fae5ffa7db323e37107c 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -643,7 +643,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                        if ( focus.Ok() )
                        {
                                Rect clientrect = { 0 , 0 , m_height , m_width } ;
                        if ( focus.Ok() )
                        {
                                Rect clientrect = { 0 , 0 , m_height , m_width } ;

-                               ClipRect( &clientrect ) ;
+                               // ClipRect( &clientrect ) ;

                        InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                        }
                }
                        InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                        }
                }


@@ -678,7 +678,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                                if ( focus.Ok() )
                                {
                                        Rect clientrect = { 0 , 0 , m_height , m_width } ;
                                if ( focus.Ok() )
                                {
                                        Rect clientrect = { 0 , 0 , m_height , m_width } ;

-                                       ClipRect( &clientrect ) ;
+                                       // ClipRect( &clientrect ) ;

                                InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                                }
                        }
                                InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                                }
                        }


@@ -916,7 +916,7 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
        if ( focus.Ok() )
        {
                Rect clientrect = { 0 , 0 , m_height , m_width } ;
        if ( focus.Ok() )
        {
                Rect clientrect = { 0 , 0 , m_height , m_width } ;

-               ClipRect( &clientrect ) ;
+               // ClipRect( &clientrect ) ;

 
        if ( rect )
        {
 
        if ( rect )
        {


@@ -1795,7 +1795,7 @@ void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
        
        GetEventHandler()->ProcessEvent(event);
        
        
        GetEventHandler()->ProcessEvent(event);
        

-    Refresh() ;
+    Refresh(false) ;

        UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
 //     MacUpdateImmediately() ;
 }
        UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
 //     MacUpdateImmediately() ;
 }