X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc3065a56f1febf3de3b3bbf0904cf8fdc7f7c50..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/x11/glcanvas.h diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h index e06246e2f5..ab61c7376a 100644 --- a/include/wx/x11/glcanvas.h +++ b/include/wx/x11/glcanvas.h @@ -13,30 +13,9 @@ #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#include "wx/gdicmn.h" +#include "wx/unix/glx11.h" -#include - -//--------------------------------------------------------------------------- -// 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 WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11 { public: wxGLCanvas(wxWindow *parent, @@ -57,13 +36,10 @@ public: 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);