additional types for carbon events

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 30a548f8fafcb9c6550e787a585e83d20d257b75..1dd103cfc1d590a6e5b222606330a3c9dd9afc8f 100644 (file)
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.h
+// Name:        wx/gtk1/glcanvas.h

 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "glcanvas.h"
-#endif
-

 #include "wx/scrolwin.h"
 #include "wx/app.h"
 
 #include "wx/scrolwin.h"
 #include "wx/app.h"
 


@@ -160,7 +156,9 @@ public:
                      *m_sharedContext;
     wxGLCanvas       *m_sharedContextOf;
     void             *m_vi; // actually an XVisualInfo*
                      *m_sharedContext;
     wxGLCanvas       *m_sharedContextOf;
     void             *m_vi; // actually an XVisualInfo*

+    GLXFBConfig      *m_fbc;

     bool              m_canFreeVi;
     bool              m_canFreeVi;

+    bool              m_canFreeFBC;

     GtkWidget        *m_glWidget;
     bool              m_exposed;
 
     GtkWidget        *m_glWidget;
     bool              m_exposed;
 


@@ -169,7 +167,12 @@ public:
     // caller is reponsible for using XFree() to deallocate
     // the returned structure.
     static void* ChooseGLVisual(int *attribList);
     // caller is reponsible for using XFree() to deallocate
     // the returned structure.
     static void* ChooseGLVisual(int *attribList);

+    static void* ChooseGLFBC(int *attribList);
+    static void GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList );

 
 

+    static void QueryGLXVersion();
+    static int GetGLXVersion();
+    static int m_glxVersion;

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxGLCanvas)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxGLCanvas)