default to simple show/hide tlw on OSX instead of transitions

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 538589ac0650ca4fab3cd29440b1b4ed2bd541a0..686346c3ccfc0c723d954d0e79cb38d4f4cbc437 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -1295,7 +1295,10 @@ bool wxTopLevelWindowMac::Show(bool show)
     if (show)
     {
         #if wxUSE_SYSTEM_OPTIONS //code contributed by Ryan Wilcox December 18, 2003
     if (show)
     {
         #if wxUSE_SYSTEM_OPTIONS //code contributed by Ryan Wilcox December 18, 2003

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

         {
            ::ShowWindow( (WindowRef)m_macWindow );
         }
         {
            ::ShowWindow( (WindowRef)m_macWindow );
         }


@@ -1313,7 +1316,10 @@ bool wxTopLevelWindowMac::Show(bool show)
     else
     {
         #if wxUSE_SYSTEM_OPTIONS
     else
     {
         #if wxUSE_SYSTEM_OPTIONS

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

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