From 3728b81a2752861a6978a7115e3958ce3b4f55ed Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 26 Apr 2003 20:32:05 +0000 Subject: [PATCH] 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 --- src/mac/carbon/toplevel.cpp | 10 +++++++--- src/mac/toplevel.cpp | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index c2e4bb3576..909567b618 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -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 ) diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index c2e4bb3576..909567b618 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -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 )