Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index e240f00118ee78ef6f7ff9addca69535f3eaa505..7f44e45910675c2fb06c14621048056a02fb8cdb 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -6,10 +6,10 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "glcanvas.h"
 #endif
 
 #pragma implementation "glcanvas.h"
 #endif
 


@@ -19,8 +19,6 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/setup.h"
-

 #if wxUSE_GLCANVAS
 
 #ifndef WX_PRECOMP
 #if wxUSE_GLCANVAS
 
 #ifndef WX_PRECOMP


@@ -331,7 +329,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 +341,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 )
         {