Removed duplicate xh_grid.cpp/h and rebaked files

[wxWidgets.git] / include / wx / mac / carbon / glcanvas.h

diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h
index 6f044609c3f5861a0c1c3677166589993deffbc6..ec86d786ca5b6b964ce7526563e2245fc5c1a695 100644 (file)
--- a/include/wx/mac/carbon/glcanvas.h
+++ b/include/wx/mac/carbon/glcanvas.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#  pragma interface "glcanvas.h"
-#endif
-
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
@@ -89,12 +85,12 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);
-   wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
+   wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
         wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), 
           int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
 
-   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL, wxWindowID id = -1,
+   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1,
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, 
         const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
 
@@ -118,7 +114,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
    
      virtual void MacSuperChangedPosition() ;
      virtual void MacTopLevelWindowChangedPosition() ;
-     virtual void MacSuperShown( bool show ) ;
+    virtual void         MacVisibilityChanged() ;
 
      void MacUpdateView() ;