X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc3065a56f1febf3de3b3bbf0904cf8fdc7f7c50..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/mac/carbon/glcanvas.h diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h index 00cf0e625a..10656f0ef8 100644 --- a/include/wx/mac/carbon/glcanvas.h +++ b/include/wx/mac/carbon/glcanvas.h @@ -20,13 +20,13 @@ # include #endif -class WXDLLEXPORT wxGLContext : public wxGLContextBase +class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase { public: wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL); virtual ~wxGLContext(); - virtual void SetCurrent(const wxGLCanvas& win) const; + virtual bool SetCurrent(const wxGLCanvas& win) const; // Mac-specific AGLContext GetAGLContext() const { return m_aglContext; } @@ -37,7 +37,7 @@ private: DECLARE_NO_COPY_CLASS(wxGLContext) }; -class WXDLLEXPORT wxGLCanvas : public wxGLCanvasBase +class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase { public: wxGLCanvas(wxWindow *parent, @@ -61,7 +61,7 @@ public: virtual ~wxGLCanvas(); // implement wxGLCanvasBase methods - virtual void SwapBuffers(); + virtual bool SwapBuffers(); // Mac-specific functions @@ -116,9 +116,8 @@ public: // 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.) + // Unlike some other platforms, this must get called if you override it, + // i.e. don't forget "event.Skip()" in your EVT_SIZE handler void OnSize(wxSizeEvent& event); virtual void MacSuperChangedPosition();