backpatch for activate error
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:
@@ -615,8 +615,10 @@ bool wxTopLevelWindowMac::Show(bool show)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (show)
|
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 ) ;
|
::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
|
||||||
@@ -627,7 +629,9 @@ bool wxTopLevelWindowMac::Show(bool show)
|
|||||||
}
|
}
|
||||||
else
|
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 )
|
if ( !show )
|
||||||
|
@@ -615,8 +615,10 @@ bool wxTopLevelWindowMac::Show(bool show)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (show)
|
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 ) ;
|
::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
|
||||||
@@ -627,7 +629,9 @@ bool wxTopLevelWindowMac::Show(bool show)
|
|||||||
}
|
}
|
||||||
else
|
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 )
|
if ( !show )
|
||||||
|
Reference in New Issue
Block a user