visibility changed code fixed

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

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index a867fa651f30077ef34633570edb500460562178..e6a8b50a69cf9343225f4a229f967929aa294098 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -320,7 +320,7 @@ bool wxGLCanvas::Show(bool show)
 {
     if ( !wxWindow::Show( show ) )
         return FALSE ;
 {
     if ( !wxWindow::Show( show ) )
         return FALSE ;

-        
+/*        

     if ( !show )
     {
         if ( m_macCanvasIsShown )
     if ( !show )
     {
         if ( m_macCanvasIsShown )


@@ -337,12 +337,13 @@ bool wxGLCanvas::Show(bool show)
             SetViewport() ;
         }
     }
             SetViewport() ;
         }
     }

+*/

     return TRUE ;
 }
 
     return TRUE ;
 }
 

-void wxGLCanvas::MacSuperShown( bool show ) 
+void wxGLCanvas::MacVisibilityChanged() 

 {
 {

-    if ( !show )
+    if ( !IsControlVisible( (ControlRef) m_macControl ) )

     {
         if ( m_macCanvasIsShown )
         {
     {
         if ( m_macCanvasIsShown )
         {


@@ -352,14 +353,13 @@ void wxGLCanvas::MacSuperShown( bool show )
     }
     else
     {
     }
     else
     {

-        if ( IsControlVisible( (ControlRef) m_macControl ) && !m_macCanvasIsShown )
+        if ( !m_macCanvasIsShown )

         {
             m_macCanvasIsShown = true ;
             SetViewport() ;
         }
     }
         {
             m_macCanvasIsShown = true ;
             SetViewport() ;
         }
     }

-        
-    wxWindow::MacSuperShown( show ) ;
+    wxWindowMac::MacVisibilityChanged() ;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------