Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / unix / glx11.h

diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h
index b29462b7c6ab01376eeb7ceb74e5a443d2124c34..b2d48eacac72fa5836c3460b2e29d999509886d8 100644 (file)
--- a/include/wx/unix/glx11.h
+++ b/include/wx/unix/glx11.h
@@ -23,11 +23,11 @@ public:
     wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
     virtual ~wxGLContext();
 
     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)
 
 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;
 
 
     GLXContext m_glContext;
 


@@ -57,7 +57,7 @@ public:
     // implement wxGLCanvasBase methods
     // --------------------------------
 
     // implement wxGLCanvasBase methods
     // --------------------------------
 

-    virtual void SwapBuffers();
+    virtual bool SwapBuffers();

 
 
     // X11-specific methods
 
 
     // X11-specific methods


@@ -66,6 +66,9 @@ public:
     // return GLX version: 13 means 1.3 &c
     static int GetGLXVersion();
 
     // 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;
 
     // 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();
 
     // 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
 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);
 
     // 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;
 
     // this is only used if it's supported i.e. if GL >= 1.3
     GLXFBConfig *m_fbc;


@@ -132,7 +135,7 @@ private:
 class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase
 {
 public:
 class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase
 {
 public:

-    wxGLApp();
+    wxGLApp() : wxGLAppBase() { }

 
     // implement wxGLAppBase method
     virtual bool InitGLVisual(const int *attribList)
 
     // implement wxGLAppBase method
     virtual bool InitGLVisual(const int *attribList)