corrected update upon activate

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 3e59235190693235617a3eaee87f4dd8c9c40fc6..725202751522545f5206ecba78ea752a2e9fb001 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -754,9 +754,11 @@ bool wxWindow::Show(bool show)
        }
        MacSuperShown( show ) ;
        Refresh() ;
+    /*
+    // this will be done by the activate event
        if(m_macWindowData)
                MacUpdateImmediately() ;
-
+    */
     return TRUE;
 }
 
@@ -1773,6 +1775,8 @@ void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
        GetEventHandler()->ProcessEvent(event);
        
        UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
+       Refresh() ;
+       MacUpdateImmediately() ;
 }
 
 void wxWindow::MacRedraw( RgnHandle updatergn , long time)

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 3e59235190693235617a3eaee87f4dd8c9c40fc6..725202751522545f5206ecba78ea752a2e9fb001 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -754,9 +754,11 @@ bool wxWindow::Show(bool show)
        }
        MacSuperShown( show ) ;
        Refresh() ;
+    /*
+    // this will be done by the activate event
        if(m_macWindowData)
                MacUpdateImmediately() ;
-
+    */
     return TRUE;
 }
 
@@ -1773,6 +1775,8 @@ void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
        GetEventHandler()->ProcessEvent(event);
        
        UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
+       Refresh() ;
+       MacUpdateImmediately() ;
 }
 
 void wxWindow::MacRedraw( RgnHandle updatergn , long time)