X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0643d43cad854f8d1b5588bb293c992d573b2a25..03773e400b6ff2692f2a9ba045d652c3b7b7109d:/include/wx/gtk/glcanvas.h?ds=sidebyside diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h index 3eb5964fd8..44cb105c93 100644 --- a/include/wx/gtk/glcanvas.h +++ b/include/wx/gtk/glcanvas.h @@ -12,139 +12,97 @@ #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#include "wx/scrolwin.h" -#include "wx/app.h" - -extern "C" { -#include -#include -#include -} - -//--------------------------------------------------------------------------- -// classes -//--------------------------------------------------------------------------- - -class WXDLLEXPORT wxGLContext; -class WXDLLEXPORT wxGLCanvas; - -//--------------------------------------------------------------------------- -// wxGLContext -//--------------------------------------------------------------------------- - - -class WXDLLEXPORT wxGLContext: public wxObject -{ -public: - wxGLContext(wxWindow* win, const wxGLContext* other=NULL /* for sharing display lists */); - virtual ~wxGLContext(); - -public: - // The win wxGLCanvas needs not necessarily be the same as the wxGLCanvas with which this context was created! - void SetCurrent(const wxGLCanvas& win) const; - - -private: - GLXContext m_glContext; - -private: - DECLARE_CLASS(wxGLContext) -}; +#include "wx/unix/glx11.h" //--------------------------------------------------------------------------- // wxGLCanvas //--------------------------------------------------------------------------- -class WXDLLEXPORT wxGLCanvas: public wxWindow +class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11 { public: - // This ctor is identical to the next, except for the fact that it - // doesn't create an implicit wxGLContext. - // The attribList parameter has been moved to avoid overload clashes. - wxGLCanvas( wxWindow *parent, wxWindowID id = -1, - int *attribList = (int*) NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette ); - - wxGLCanvas( wxWindow *parent, 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 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, - 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 ); - - bool Create( wxWindow *parent, - const wxGLContext *shared = (wxGLContext*)NULL, - const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL, - wxWindowID id = -1, + wxGLCanvas(wxWindow *parent, + wxWindowID id = wxID_ANY, + const int *attribList = NULL, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxGLCanvasName, + const wxPalette& palette = wxNullPalette); + + bool Create(wxWindow *parent, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxGLCanvasName, - int *attribList = (int*) NULL, - const wxPalette& palette = wxNullPalette ); - - virtual ~wxGLCanvas(); + const int *attribList = NULL, + const wxPalette& palette = wxNullPalette); + + + // implement wxGLCanvasX11 methods + // -------------------------------- + + virtual Window GetXWindow() const; + + + // deprecated methods + // ------------------ + +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( + wxGLCanvas(wxWindow *parent, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxGLCanvasName, + const int *attribList = NULL, + const wxPalette& palette = wxNullPalette) + ); + + wxDEPRECATED( + wxGLCanvas(wxWindow *parent, + const wxGLContext *shared, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxGLCanvasName, + const int *attribList = NULL, + const wxPalette& palette = wxNullPalette) + ); + + wxDEPRECATED( + wxGLCanvas(wxWindow *parent, + const wxGLCanvas *shared, + wxWindowID id = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxGLCanvasName, + const int *attribList = NULL, + const wxPalette& palette = wxNullPalette) + ); + + // called from "realized" callback to create the implicit context if needed + void GTKInitImplicitContext(); +#endif // WXWIN_COMPATIBILITY_2_8 + + // implementation from now on + void OnInternalIdle(); - void SetCurrent(const wxGLContext& RC) const; - void SetCurrent(); - void SetColour(const wxChar *colour); - void SwapBuffers(); - - void OnSize(wxSizeEvent& event); - - void OnInternalIdle(); - - inline wxGLContext* GetContext() const { return m_glContext; } - - // implementation + bool m_exposed; - wxGLContext *m_glContext, - *m_sharedContext; +#if WXWIN_COMPATIBILITY_2_8 + wxGLContext *m_sharedContext; wxGLCanvas *m_sharedContextOf; const bool m_createImplicitContext; - void *m_vi; // actually an XVisualInfo* - GLXFBConfig *m_fbc; - bool m_canFreeVi; - bool m_canFreeFBC; - GtkWidget *m_glWidget; - bool m_exposed; +#endif // WXWIN_COMPATIBILITY_2_8 - // returns an XVisualInfo* based on desired GL attributes; - // returns NULL if an appropriate visual is not found. The - // 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) }; -#endif - // _WX_GLCANVAS_H_ +#endif // _WX_GLCANVAS_H_