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

backpatch for activate error

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-04-26 20:32:05 +00:00
parent 146afc4d24
commit 3728b81a27
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -615,8 +615,10 @@ bool wxTopLevelWindowMac::Show(bool show)
return FALSE;
if (show)
{
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
{
// this is leading to incorrect window layering in some situations
// ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
::ShowWindow( (WindowRef)m_macWindow ) ;
::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
@@ -627,7 +629,9 @@ bool wxTopLevelWindowMac::Show(bool show)
}
else
{
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
// this is leading to incorrect window layering in some situations
// ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
::HideWindow( (WindowRef)m_macWindow ) ;
}
if ( !show )

10
src/mac/toplevel.cpp
View File

@@ -615,8 +615,10 @@ bool wxTopLevelWindowMac::Show(bool show)
return FALSE;
if (show)
{
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
{
// this is leading to incorrect window layering in some situations
// ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
::ShowWindow( (WindowRef)m_macWindow ) ;
::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
@@ -627,7 +629,9 @@ bool wxTopLevelWindowMac::Show(bool show)
}
else
{
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
// this is leading to incorrect window layering in some situations
// ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
::HideWindow( (WindowRef)m_macWindow ) ;
}
if ( !show )