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 877d50197458d6c8aecad1d28dc1489a2a700238..dae7bff782cc63267cc7ce80b71998fec36f4472 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
 // Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
 // Purpose:     wxGLCanvas, for using OpenGL with wxWindows under Macintosh

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #  pragma interface "glcanvas.h"
 #endif
 
 #  pragma interface "glcanvas.h"
 #endif
 


@@ -82,7 +82,7 @@ public:
    wxWindow*        m_window;
 };
 
    wxWindow*        m_window;
 };
 

-class WXDLLEXPORT wxGLCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxGLCanvas: public wxWindow

 {
    DECLARE_CLASS(wxGLCanvas)
  public:
 {
    DECLARE_CLASS(wxGLCanvas)
  public:


@@ -92,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", 
    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, 
 
    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,
 
    ~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);
 
    void SetCurrent();
    void SetColour(const char *colour);


@@ -114,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);
    // 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; }
 
 
    inline wxGLContext* GetContext() const { return m_glContext; }