X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ec69e9666e300c9ba210812a11ca5dc9111b5f9..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/unix/glx11.h

diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h
index 7f48e91891..34ed4dd46d 100644
--- a/include/wx/unix/glx11.h
+++ b/include/wx/unix/glx11.h
@@ -3,7 +3,6 @@
 // Purpose:     class common for all X11-based wxGLCanvas implementations
 // Author:      Vadim Zeitlin
 // Created:     2007-04-15
-// RCS-ID:      $Id$
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -66,6 +65,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 +97,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 +112,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;
@@ -132,7 +134,7 @@ private:
 class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase
 {
 public:
-    wxGLApp();
+    wxGLApp() : wxGLAppBase() { }
 
     // implement wxGLAppBase method
     virtual bool InitGLVisual(const int *attribList)