From 8c8f6a4b1dea7e0b92b7e9a90b23851d85b73439 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 10 Dec 2005 13:08:54 +0000 Subject: [PATCH] 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 --- src/mac/carbon/toplevel.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 538589ac06..686346c3cc 100644 --- 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 ( (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 ); } @@ -1313,7 +1316,10 @@ bool wxTopLevelWindowMac::Show(bool show) 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 ); } -- 2.45.2