#include "wx/settings.h" wxSystemSettings is needed by non-OSX code.

[wxWidgets.git] / src / mac / carbon / glcanvas.cpp

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index e240f00118ee78ef6f7ff9addca69535f3eaa505..facd34a510bd3229c5d265e40aca9488619a47fc 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWidgets licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -331,7 +331,7 @@ bool wxGLCanvas::Show(bool show)
     }
     else
     {
     }
     else
     {

-        if ( IsControlVisible( (ControlRef) m_macControl ) && !m_macCanvasIsShown )
+        if ( m_peer->IsVisible()&& !m_macCanvasIsShown )

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


@@ -343,7 +343,7 @@ bool wxGLCanvas::Show(bool show)
 
 void wxGLCanvas::MacVisibilityChanged() 
 {
 
 void wxGLCanvas::MacVisibilityChanged() 
 {

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

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