set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index fe7c581b257539382feacbeb6f1f677b0f4ad45f..9619864f944f0945b2df70ea94be7754a4fe145d 100644 (file)
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -6,13 +6,9 @@
 // Created:     17/8/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "glcanvas.h"
-#endif
-
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
@@ -116,14 +112,14 @@ public:
         long style = 0, const wxString& name = wxGLCanvasName,
         int *attribList = (int*) NULL,
         const wxPalette& palette = wxNullPalette );
-   wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
+   wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
         wxWindowID id = -1,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0, const wxString& name = wxGLCanvasName,
         int *attribList = (int*) NULL,
         const wxPalette& palette = wxNullPalette );
-   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL,
+   wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared,
         wxWindowID id = -1,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -160,7 +156,9 @@ public:
                      *m_sharedContext;
     wxGLCanvas       *m_sharedContextOf;
     void             *m_vi; // actually an XVisualInfo*
+    GLXFBConfig      *m_fbc;
     bool              m_canFreeVi;
+    bool              m_canFreeFBC;
     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);
+    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)