X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/047b6c71d622880bd30aafbc7f31e8729b4d653a..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/unix/glx11.h?ds=sidebyside diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h index da982ca6c7..b2d48eacac 100644 --- a/include/wx/unix/glx11.h +++ b/include/wx/unix/glx11.h @@ -17,17 +17,17 @@ // wxGLContext // ---------------------------------------------------------------------------- -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; private: // attach context to the drawable or unset it (if NULL) - static void MakeCurrent(GLXDrawable drawable, GLXContext context); + static bool MakeCurrent(GLXDrawable drawable, GLXContext context); GLXContext m_glContext; @@ -38,7 +38,7 @@ private: // wxGLCanvasX11 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGLCanvasX11 : public wxGLCanvasBase +class WXDLLIMPEXP_GL wxGLCanvasX11 : public wxGLCanvasBase { public: // initialization and dtor @@ -57,7 +57,7 @@ public: // implement wxGLCanvasBase methods // -------------------------------- - virtual void SwapBuffers(); + virtual bool SwapBuffers(); // X11-specific methods @@ -66,6 +66,9 @@ public: // return GLX version: 13 means 1.3 &c static int GetGLXVersion(); + // return true if multisample extension is available + static bool IsGLXMultiSampleAvailable(); + // get the X11 handle of this window virtual Window GetXWindow() const = 0; @@ -95,6 +98,13 @@ public: // free the global GL visual, called by wxGLApp static void FreeDefaultVisualInfo(); + // initializes XVisualInfo (in any case) and, if supported, GLXFBConfig + // + // returns false if XVisualInfo couldn't be initialized, otherwise caller + // is responsible for freeing the pointers + static bool InitXVisualInfo(const int *attribList, + GLXFBConfig **pFBC, XVisualInfo **pXVisual); + private: // fills in glattrs with attributes defined by wxattrs which must be // 0-terminated if it is non-NULL @@ -103,13 +113,6 @@ private: // should be at least 16 to accommodate the default attributes static bool ConvertWXAttrsToGL(const int *wxattrs, int *glattrs, size_t n); - // initializes XVisualInfo (in any case) and, if supported, GLXFBConfig - // - // returns false if XVisualInfo couldn't be initialized, otherwise caller - // is responsible for freeing the pointers - static bool InitXVisualInfo(const int *attribList, - GLXFBConfig **pFBC, XVisualInfo **pXVisual); - // this is only used if it's supported i.e. if GL >= 1.3 GLXFBConfig *m_fbc; @@ -129,10 +132,10 @@ private: // this is used in wx/glcanvas.h, prevent it from defining a generic wxGLApp #define wxGL_APP_DEFINED -class wxGLApp : public wxGLAppBase +class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase { public: - wxGLApp(); + wxGLApp() : wxGLAppBase() { } // implement wxGLAppBase method virtual bool InitGLVisual(const int *attribList)