Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switched hide and show calls to using transition window calls, this supports animation and sound support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-09-20 19:16:56 +00:00
parent a14865055c
commit 65653bad15
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mac/carbon/toplevel.cpp
View File

@@ -322,7 +322,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
else else
{ {
#if TARGET_CARBON
wclass = kPlainWindowClass ; wclass = kPlainWindowClass ;
#else
wclass = kFloatingWindowClass ;
#endif
} }
} }
else if ( HasFlag( wxCAPTION ) ) else if ( HasFlag( wxCAPTION ) )
@@ -345,7 +349,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
else else
{ {
#if TARGET_CARBON
wclass = kPlainWindowClass ; wclass = kPlainWindowClass ;
#else
wclass = kModalWindowClass ;
#endif
} }
} }
@@ -604,8 +612,8 @@ bool wxTopLevelWindowMac::Show(bool show)
return FALSE; return FALSE;
if (show) if (show)
{ {
::ShowWindow( (WindowRef)m_macWindow ) ; ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
::SelectWindow( (WindowRef)m_macWindow ) ; ::SelectWindow( (WindowRef)m_macWindow ) ;
// no need to generate events here, they will get them triggered by macos // no need to generate events here, they will get them triggered by macos
// actually they should be , but apparently they are not // actually they should be , but apparently they are not
@@ -616,7 +624,7 @@ bool wxTopLevelWindowMac::Show(bool show)
} }
else else
{ {
::HideWindow( (WindowRef)m_macWindow ) ; ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
} }
if ( !show ) if ( !show )

14
src/mac/toplevel.cpp
View File

@@ -322,7 +322,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
else else
{ {
#if TARGET_CARBON
wclass = kPlainWindowClass ; wclass = kPlainWindowClass ;
#else
wclass = kFloatingWindowClass ;
#endif
} }
} }
else if ( HasFlag( wxCAPTION ) ) else if ( HasFlag( wxCAPTION ) )
@@ -345,7 +349,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
else else
{ {
#if TARGET_CARBON
wclass = kPlainWindowClass ; wclass = kPlainWindowClass ;
#else
wclass = kModalWindowClass ;
#endif
} }
} }
@@ -604,8 +612,8 @@ bool wxTopLevelWindowMac::Show(bool show)
return FALSE; return FALSE;
if (show) if (show)
{ {
::ShowWindow( (WindowRef)m_macWindow ) ; ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
::SelectWindow( (WindowRef)m_macWindow ) ; ::SelectWindow( (WindowRef)m_macWindow ) ;
// no need to generate events here, they will get them triggered by macos // no need to generate events here, they will get them triggered by macos
// actually they should be , but apparently they are not // actually they should be , but apparently they are not
@@ -616,7 +624,7 @@ bool wxTopLevelWindowMac::Show(bool show)
} }
else else
{ {
::HideWindow( (WindowRef)m_macWindow ) ; ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
} }
if ( !show ) if ( !show )