surround deprecated wxImage methods in WXWIN_COMPATIBILITY_2_2

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

diff --git a/include/wx/mac/glcanvas.h b/include/wx/mac/glcanvas.h
index 73e067d3019c4b34401ba47b8970e86fca49ea2f..5231ed7196d5af60cc37462d0122b523e287003b 100644 (file)
--- a/include/wx/mac/glcanvas.h
+++ b/include/wx/mac/glcanvas.h
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma interface "glcanvas.h"
+#  pragma interface "glcanvas.h"

 #endif
 
 #ifndef _WX_GLCANVAS_H_
 #endif
 
 #ifndef _WX_GLCANVAS_H_


@@ -22,9 +22,15 @@
 
 #include "wx/palette.h"
 #include "wx/scrolwin.h"
 
 #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
 
 //---------------------------------------------------------------------------
 // Constants for attriblist


@@ -76,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:


@@ -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);
    // 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; }