cleanup - reformat; added (disabled) support for secondary highlight color

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

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index 732de7df9f9f4729844e56ecdd5d53b13f83e397..ac3533cefcf114a14f69dc6ff91fb5d7426c1f96 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -9,18 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "glcanvas.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #pragma hdrstop
 #endif
 
-#include "wx/setup.h"
-
 #if wxUSE_GLCANVAS
 
 #ifndef WX_PRECOMP
@@ -331,7 +325,7 @@ bool wxGLCanvas::Show(bool show)
     }
     else
     {
-        if ( IsControlVisible( *m_peer ) && !m_macCanvasIsShown )
+        if ( m_peer->IsVisible()&& !m_macCanvasIsShown )
         {
             m_macCanvasIsShown = true ;
             SetViewport() ;
@@ -343,7 +337,7 @@ bool wxGLCanvas::Show(bool show)
 
 void wxGLCanvas::MacVisibilityChanged() 
 {
-    if ( !IsControlVisible( *m_peer ) )
+    if ( !MacIsReallyShown() )
     {
         if ( m_macCanvasIsShown )
         {