added support for GTK2 label mnemonics (patch #689573)

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

diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h
index 73e067d3019c4b34401ba47b8970e86fca49ea2f..dae7bff782cc63267cc7ce80b71998fec36f4472 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
 // Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma interface "glcanvas.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#  pragma interface "glcanvas.h"
 #endif
 
 #ifndef _WX_GLCANVAS_H_
@@ -22,9 +22,15 @@
 
 #include "wx/palette.h"
 #include "wx/scrolwin.h"
-
-#include <gl.h>
-#include <agl.h>
+#include "wx/app.h"
+
+#ifdef __DARWIN__
+#  include <OpenGL/gl.h>
+#  include <AGL/agl.h>
+#else
+#  include <gl.h>
+#  include <agl.h>
+#endif
 
 //---------------------------------------------------------------------------
 // Constants for attriblist
@@ -76,7 +82,7 @@ public:
    wxWindow*        m_window;
 };
 
-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
@@ -86,17 +92,17 @@ class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
    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 = "GLCanvas", 
-             int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
+          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, 
-               const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette );
+        const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette );
 
    ~wxGLCanvas();
 
    bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id,
                const wxPoint& pos, const wxSize& size, long style, const wxString& name,
-              int *attribList, const wxPalette& palette);
+           int *attribList, const wxPalette& palette);
 
    void SetCurrent();
    void SetColour(const char *colour);
@@ -108,6 +114,10 @@ class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
    // 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() ;
+     void MacUpdateView() ;
 
    inline wxGLContext* GetContext() const { return m_glContext; }