X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0643d43cad854f8d1b5588bb293c992d573b2a25..3c029873c66cfdc0dcbf52958970273435ba02fc:/include/wx/mac/carbon/glcanvas.h diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h index bd80bfb7ff..00cf0e625a 100644 --- a/include/wx/mac/carbon/glcanvas.h +++ b/include/wx/mac/carbon/glcanvas.h @@ -12,14 +12,6 @@ #ifndef _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_ -#include "wx/defs.h" - -#if wxUSE_GLCANVAS - -#include "wx/palette.h" -#include "wx/scrolwin.h" -#include "wx/app.h" - #ifdef __DARWIN__ # include # include @@ -28,79 +20,121 @@ # include #endif -class WXDLLEXPORT wxGLCanvas; /* forward reference */ - -class WXDLLEXPORT wxGLContext: public wxObject +class WXDLLEXPORT wxGLContext : public wxGLContextBase { public: - wxGLContext(AGLPixelFormat fmt, wxGLCanvas *win, - const wxPalette& WXUNUSED(palette), - const wxGLContext *other /* for sharing display lists */ - ); - virtual ~wxGLContext(); + wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL); + virtual ~wxGLContext(); - void SetCurrent(); - void Update(); // must be called after window drag/grows/zoom or clut change - void SetColour(const wxChar *colour); - void SwapBuffers(); + virtual void SetCurrent(const wxGLCanvas& win) const; + // Mac-specific + AGLContext GetAGLContext() const { return m_aglContext; } - inline wxWindow* GetWindow() const { return m_window; } - inline AGLDrawable GetDrawable() const { return m_drawable; } +private: + AGLContext m_aglContext; -public: - AGLContext m_glContext; - AGLDrawable m_drawable; - wxWindow* m_window; + DECLARE_NO_COPY_CLASS(wxGLContext) }; -class WXDLLEXPORT wxGLCanvas: public wxWindow +class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase { - DECLARE_CLASS(wxGLCanvas) - public: - wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette); - wxGLCanvas( wxWindow *parent, const wxGLContext *shared, - wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), - int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); - - wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); - - virtual ~wxGLCanvas(); - - bool Create(wxWindow *parent, const wxGLContext *shared, wxWindowID id, - const wxPoint& pos, const wxSize& size, long style, const wxString& name, - int *attribList, const wxPalette& palette); - - void SetCurrent(); - void SetColour(const wxChar *colour); - void SwapBuffers(); - void UpdateContext(); - void SetViewport(); - virtual bool Show(bool show = true) ; - - // Unlike some other platforms, this must get called if you override it. - // It sets the viewport correctly and update the context. - // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.) - void OnSize(wxSizeEvent& event); - - virtual void MacSuperChangedPosition() ; - virtual void MacTopLevelWindowChangedPosition() ; - virtual void MacVisibilityChanged() ; - - void MacUpdateView() ; - - inline wxGLContext* GetContext() const { return m_glContext; } +public: + 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); + + virtual ~wxGLCanvas(); + + // implement wxGLCanvasBase methods + virtual void SwapBuffers(); + + + // Mac-specific functions + // ---------------------- + + // return the pixel format used by this window + AGLPixelFormat GetAGLPixelFormat() const { return m_aglFormat; } + + // update the view port of the current context to match this window + void SetViewport(); + + + // 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) + ); +#endif // WXWIN_COMPATIBILITY_2_8 + + // implementation-only from now on + + // Unlike some other platforms, this must get called if you override it. + // It sets the viewport correctly and update the context. + // You shouldn't call glViewport yourself either (use SetViewport if you must reset it.) + void OnSize(wxSizeEvent& event); + + virtual void MacSuperChangedPosition(); + virtual void MacTopLevelWindowChangedPosition(); + virtual void MacVisibilityChanged(); + + void MacUpdateView(); protected: - wxGLContext* m_glContext; - bool m_macCanvasIsShown ; -DECLARE_EVENT_TABLE() + AGLPixelFormat m_aglFormat; + + bool m_macCanvasIsShown, + m_needsUpdate; + + DECLARE_EVENT_TABLE() + DECLARE_CLASS(wxGLCanvas) }; -#endif // wxUSE_GLCANVAS #endif // _WX_GLCANVAS_H_