transition window calls had some problems with layering, switched back to hide and...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index fc40bd694c7af57724c72cf98fa88587f134dc57..b9dec80021dfd7dc6abc0e5d0b4231a7731594b9 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -860,7 +860,9 @@ bool wxTopLevelWindowMac::Show(bool show)
 
     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 ) ;
       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not
       ::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


@@ -871,7 +873,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 )

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index fc40bd694c7af57724c72cf98fa88587f134dc57..b9dec80021dfd7dc6abc0e5d0b4231a7731594b9 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -860,7 +860,9 @@ bool wxTopLevelWindowMac::Show(bool show)
 
     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 ) ;
       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not
       ::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


@@ -871,7 +873,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 )