X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0643d43cad854f8d1b5588bb293c992d573b2a25..75ded4d17344618afd302a0671f1277791ee17ed:/include/wx/gtk1/glcanvas.h diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h index 0ba6b3ef66..0700ed60c5 100644 --- a/include/wx/gtk1/glcanvas.h +++ b/include/wx/gtk1/glcanvas.h @@ -12,148 +12,98 @@ #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; +#include "wx/unix/glx11.h" //--------------------------------------------------------------------------- -// wxGLContext +// wxGLCanvas //--------------------------------------------------------------------------- - -class WXDLLEXPORT wxGLContext: public wxObject +class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11 { public: - wxGLContext( bool isRGB, wxWindow *win, const wxPalette& palette = wxNullPalette ); - wxGLContext( - bool WXUNUSED(isRGB), wxWindow *win, - const wxPalette& WXUNUSED(palette), - const wxGLContext *other /* for sharing display lists */ - ); - virtual ~wxGLContext(); - - void SetCurrent(); - void SetColour(const wxChar *colour); - void SwapBuffers(); - - void SetupPixelFormat(); - void SetupPalette(const wxPalette& palette); - wxPalette CreateDefaultPalette(); + 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, + const int *attribList = NULL, + const wxPalette& palette = wxNullPalette); - inline wxPalette* GetPalette() const { return (wxPalette*) & m_palette; } - inline wxWindow* GetWindow() const { return m_window; } - inline GtkWidget* GetWidget() const { return m_widget; } - inline GLXContext GetContext() const { return m_glContext; } -public: - GLXContext m_glContext; + // implement wxGLCanvasX11 methods + // ------------------------------- - GtkWidget *m_widget; - wxPalette m_palette; - wxWindow* m_window; + virtual Window GetXWindow() const; -private: - DECLARE_CLASS(wxGLContext) -}; -//--------------------------------------------------------------------------- -// wxGLCanvas -//--------------------------------------------------------------------------- + // deprecated methods + // ------------------ -class WXDLLEXPORT wxGLCanvas: public wxWindow -{ -public: - inline wxGLCanvas() { - m_glContext = (wxGLContext*) NULL; - m_sharedContext = (wxGLContext*) NULL; - m_glWidget = (GtkWidget*) NULL; - m_vi = (void*) NULL; - m_exposed = FALSE; - } - 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, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - int *attribList = (int*) NULL, - const wxPalette& palette = wxNullPalette ); +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED_CONSTRUCTOR( + 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) + ); - virtual ~wxGLCanvas(); + wxDEPRECATED_CONSTRUCTOR( + 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) + ); - void SetCurrent(); - void SetColour(const wxChar *colour); - void SwapBuffers(); + wxDEPRECATED_CONSTRUCTOR( + 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) + ); - void OnSize(wxSizeEvent& event); + // called from "realized" callback to create the implicit context if needed + void GTKInitImplicitContext(); +#endif // WXWIN_COMPATIBILITY_2_8 - void OnInternalIdle(); + // implementation from now on + virtual void OnInternalIdle(); - inline wxGLContext* GetContext() const { return m_glContext; } - // implementation + GtkWidget *m_glWidget; - wxGLContext *m_glContext, - *m_sharedContext; +#if WXWIN_COMPATIBILITY_2_8 + wxGLContext *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; - - // 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; + const bool m_createImplicitContext; +#endif // WXWIN_COMPATIBILITY_2_8 + private: - DECLARE_EVENT_TABLE() DECLARE_CLASS(wxGLCanvas) }; -#endif - // _WX_GLCANVAS_H_ +#endif // _WX_GLCANVAS_H_