use wxDiskspaceSize_t which is long and not wxLongLong if wxUSE_LONGLONG==0 (part...

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

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index 732de7df9f9f4729844e56ecdd5d53b13f83e397..e64e4c01e3895e134792620fd4f8ac11f16dde7a 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -9,18 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "glcanvas.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #pragma hdrstop
 #endif
 

-#include "wx/setup.h"
-

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


@@ -219,6 +213,8 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
                         const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                         int *attribList, const wxPalette& palette)
 {
                         const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                         int *attribList, const wxPalette& palette)
 {

+    m_macCanvasIsShown = false ;
+    m_glContext = 0 ;

     wxWindow::Create( parent, id, pos, size, style, name );
     
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);
     wxWindow::Create( parent, id, pos, size, style, name );
     
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);


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

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

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


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

-    if ( !IsControlVisible( *m_peer ) )
+    if ( !MacIsReallyShown() )

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