Forward SetFont, SetBackgroundColour and SetForegroundCOlour to the

[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..802067a0cb4d402826c1e99ac861b6878461beee 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
+// Name:        wx/mac/carbon/glcanvas.h
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
@@ -9,14 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#  pragma interface "glcanvas.h"
-#endif
-
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_GLCANVAS
 
@@ -61,11 +57,11 @@ class WXDLLEXPORT wxGLCanvas;     /* forward reference */
 class WXDLLEXPORT wxGLContext: public wxObject
 {
 public:
-   wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, 
+   wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win,
                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );
-   ~wxGLContext();
+   virtual ~wxGLContext();
 
    void SetCurrent();
    void Update();  // must be called after window drag/grows/zoom or clut change
@@ -86,19 +82,19 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
-   wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+   wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, 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,
-        wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), 
+   wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
+        wxWindowID id = wxID_ANY, 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,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, 
+   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
 
-   ~wxGLCanvas();
+   virtual ~wxGLCanvas();
 
    bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id,
                const wxPoint& pos, const wxSize& size, long style, const wxString& name,
@@ -109,24 +105,24 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
    void SwapBuffers();
    void UpdateContext();
    void SetViewport();
-   virtual bool Show(bool show = TRUE) ;
-   
+   virtual bool Show(bool show = true) ;
+
    // Unlike some other platforms, this must get called if you override it.
    // It sets the viewport correctly and update the context.
    // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.)
    void OnSize(wxSizeEvent& event);
-   
-     virtual void MacSuperChangedPosition() ;
-     virtual void MacTopLevelWindowChangedPosition() ;
-     virtual void MacSuperShown( bool show ) ;
 
-     void MacUpdateView() ;
+   virtual void MacSuperChangedPosition() ;
+   virtual void MacTopLevelWindowChangedPosition() ;
+   virtual void         MacVisibilityChanged() ;
+
+   void MacUpdateView() ;
 
    inline wxGLContext* GetContext() const { return m_glContext; }
 
 protected:
     wxGLContext*   m_glContext;
-       bool m_macCanvasIsShown ;
+    bool m_macCanvasIsShown ;
 DECLARE_EVENT_TABLE()
 };