simplified ::Show

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 2407ac63e4d7415e2a91fc2217b4bb054399efd9..c3b1feab50b7f3b944a7e2f643bd672b457fbce4 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -1357,22 +1357,21 @@ bool wxTopLevelWindowMac::Show(bool show)
     if ( !wxTopLevelWindowBase::Show(show) )
         return false;
 
     if ( !wxTopLevelWindowBase::Show(show) )
         return false;
 

-    if (show)
-    {
+    bool plainTransition = false;
+

 #if wxUSE_SYSTEM_OPTIONS
 #if wxUSE_SYSTEM_OPTIONS

-        // code contributed by Ryan Wilcox December 18, 2003
-        bool plainTransition = UMAGetSystemVersion() >= 0x1000 ;
-        if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
-            plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;
+    // code contributed by Ryan Wilcox December 18, 2003
+    plainTransition = UMAGetSystemVersion() >= 0x1000 ;
+    if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
+        plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;
+#endif

 
 

+    if (show)
+    {

         if ( plainTransition )
            ::ShowWindow( (WindowRef)m_macWindow );
         else
            ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
         if ( plainTransition )
            ::ShowWindow( (WindowRef)m_macWindow );
         else
            ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );

-#else
-
-        ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
-#endif

 
         ::SelectWindow( (WindowRef)m_macWindow ) ;
 
 
         ::SelectWindow( (WindowRef)m_macWindow ) ;
 


@@ -1383,19 +1382,10 @@ bool wxTopLevelWindowMac::Show(bool show)
     }
     else
     {
     }
     else
     {

-#if wxUSE_SYSTEM_OPTIONS
-        bool plainTransition = UMAGetSystemVersion() >= 0x1000 ;
-        if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
-            plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;

         if ( plainTransition )
         if ( plainTransition )

-        {
-           ::HideWindow((WindowRef) m_macWindow );
-        }
+           ::HideWindow( (WindowRef)m_macWindow );

         else
         else

-#endif
-        {
-           ::TransitionWindow((WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL );
-        }
+           ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL );

     }
 
     MacPropagateVisibilityChanged() ;
     }
 
     MacPropagateVisibilityChanged() ;


@@ -1491,12 +1481,13 @@ void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
 #endif
 }
 
 #endif
 }
 

-// we are still using coordinates of the content view; TODO: switch to structure bounds
-
+// we are still using coordinates of the content view
+// TODO: switch to structure bounds
+//

 void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
 {
 void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
 {

-    Rect content ;
-    Rect structure ;
+    Rect content, structure ;
+

     GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ;
     GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ;
 
     GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ;
     GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ;