Refactor all code common to X11 OpenGL implementations into glx11.h/.cpp

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

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index e06246e2f5a110a4bfd454a50ddb99c57e86ff78..4e20ce6a568c0856beaa78c3ba5d263d05b19f21 100644 (file)
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -13,30 +13,9 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 

-#include "wx/gdicmn.h"
+#include "wx/unix/glx11.h"

 
 

-#include <GL/glx.h>
-
-//---------------------------------------------------------------------------
-// classes
-//---------------------------------------------------------------------------
-
-class WXDLLEXPORT wxGLContext : public wxGLContextBase
-{
-public:
-    wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
-    virtual ~wxGLContext();
-
-    virtual void SetCurrent(const wxGLCanvas& win) const;
-
-private:
-    GLXContext       m_glContext;
-
-    DECLARE_CLASS(wxGLContext)
-};
-
-
-class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase
+class WXDLLEXPORT wxGLCanvas : public wxGLCanvasX11

 {
 public:
     wxGLCanvas(wxWindow *parent,
 {
 public:
     wxGLCanvas(wxWindow *parent,


@@ -57,13 +36,10 @@ public:
                 const int *attribList = NULL,
                 const wxPalette& palette = wxNullPalette);
 
                 const int *attribList = NULL,
                 const wxPalette& palette = wxNullPalette);
 

-    virtual ~wxGLCanvas();
-
-    virtual void SwapBuffers();
-
+    // implement wxGLCanvasX11 methods
+    // --------------------------------

 
 

-    // implementation
-    void *m_vi;
+    virtual Window GetXWindow() const;

 
 protected:
     virtual int GetColourIndex(const wxColour& col);
 
 protected:
     virtual int GetColourIndex(const wxColour& col);