renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing

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

diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index f4c812ffa893d761b416e5b888b9d0c704bc204d..ce59b1ad673bd11b3eebbd2ff6cc9286f2bfc850 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"
 


@@ -70,7 +66,7 @@ public:
                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );
                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
     );

-    ~wxGLContext();
+    virtual ~wxGLContext();

 
     void SetCurrent();
     void SetColour(const wxChar *colour);
 
     void SetCurrent();
     void SetColour(const wxChar *colour);


@@ -116,14 +112,14 @@ public:
         long style = 0, const wxString& name = wxGLCanvasName,
         int *attribList = (int*) NULL,
         const wxPalette& palette = wxNullPalette );
         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 );
         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,
         wxWindowID id = -1,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,


@@ -142,7 +138,7 @@ public:
                 int *attribList = (int*) NULL,
                 const wxPalette& palette = wxNullPalette );
 
                 int *attribList = (int*) NULL,
                 const wxPalette& palette = wxNullPalette );
 

-   ~wxGLCanvas();
+   virtual ~wxGLCanvas();

 
    void SetCurrent();
    void SetColour(const wxChar *colour);
 
    void SetCurrent();
    void SetColour(const wxChar *colour);


@@ -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)