From 65653bad15a6b19ceba0926e377e6c432bc8bef6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 20 Sep 2002 19:16:56 +0000 Subject: [PATCH] switched hide and show calls to using transition window calls, this supports animation and sound support git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/toplevel.cpp | 14 +++++++++++--- src/mac/toplevel.cpp | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index efcf1a737d..35f09fe55f 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -322,7 +322,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } else { +#if TARGET_CARBON wclass = kPlainWindowClass ; +#else + wclass = kFloatingWindowClass ; +#endif } } else if ( HasFlag( wxCAPTION ) ) @@ -345,7 +349,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } else { +#if TARGET_CARBON wclass = kPlainWindowClass ; +#else + wclass = kModalWindowClass ; +#endif } } @@ -604,8 +612,8 @@ bool wxTopLevelWindowMac::Show(bool show) return FALSE; if (show) - { - ::ShowWindow( (WindowRef)m_macWindow ) ; + { + ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); ::SelectWindow( (WindowRef)m_macWindow ) ; // no need to generate events here, they will get them triggered by macos // actually they should be , but apparently they are not @@ -616,7 +624,7 @@ bool wxTopLevelWindowMac::Show(bool show) } else { - ::HideWindow( (WindowRef)m_macWindow ) ; + ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil); } if ( !show ) diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index efcf1a737d..35f09fe55f 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -322,7 +322,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } else { +#if TARGET_CARBON wclass = kPlainWindowClass ; +#else + wclass = kFloatingWindowClass ; +#endif } } else if ( HasFlag( wxCAPTION ) ) @@ -345,7 +349,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } else { +#if TARGET_CARBON wclass = kPlainWindowClass ; +#else + wclass = kModalWindowClass ; +#endif } } @@ -604,8 +612,8 @@ bool wxTopLevelWindowMac::Show(bool show) return FALSE; if (show) - { - ::ShowWindow( (WindowRef)m_macWindow ) ; + { + ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); ::SelectWindow( (WindowRef)m_macWindow ) ; // no need to generate events here, they will get them triggered by macos // actually they should be , but apparently they are not @@ -616,7 +624,7 @@ bool wxTopLevelWindowMac::Show(bool show) } else { - ::HideWindow( (WindowRef)m_macWindow ) ; + ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil); } if ( !show )