X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f41bc3e3f3fda37fba548440b230288c5eed0953..3ba18664fc65e3494695bbd57250bcee36625c91:/src/x11/glcanvas.cpp

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index c7bf78eb39..3736c7e91e 100644
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -18,9 +18,12 @@
 
 #if wxUSE_GLCANVAS
 
+// #error Sorry, wxGLCanvas does not work yet with wxX11
+
 #include "wx/glcanvas.h"
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/log.h"
 
 #ifdef __VMS
 # pragma message disable nosimpint
@@ -237,8 +240,8 @@ bool wxGLCanvas::Create( wxWindow *parent,
 
     // Check for the presence of the GLX extension
     if(!glXQueryExtension(display, NULL, NULL)) {
-	wxDebugMsg("wxGLCanvas: GLX extension is missing\n");
-	return false;
+	wxLogDebug("wxGLCanvas: GLX extension is missing\n");
+	return FALSE;
     }
 
     if(attribList) {
@@ -286,7 +289,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
       attribList = (int*) data;
       // Get an appropriate visual
       vi = glXChooseVisual(display, DefaultScreen(display), attribList);
-      if(!vi) return false;
+      if(!vi) return FALSE;
       
       // Here we should make sure that vi is the same visual as the
       // one used by the xwindow drawable in wxCanvas.  However,
@@ -297,9 +300,9 @@ bool wxGLCanvas::Create( wxWindow *parent,
 	XGetWindowAttributes(display, (Window) GetClientAreaWindow(), &xwa);
 	vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
 	vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
-	if(!vi) return false;
+	if(!vi) return FALSE;
 	glXGetConfig(display, vi, GLX_USE_GL, &val);
-	if(!val) return false;
+	if(!val) return FALSE;
 	// Basically, this is it.  It should be possible to use vi
 	// in glXCreateContext() below.  But this fails with Mesa.
 	// I notified the Mesa author about it; there may be a fix.
@@ -326,7 +329,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 	a_list[n] = None;
 	// XFree(vi);
 	vi = glXChooseVisual(display, DefaultScreen(display), a_list);
-	if(!vi) return false;
+	if(!vi) return FALSE;
 #endif /* OLD_MESA */
     }
 
@@ -347,7 +350,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 #endif
     SetCurrent();
 
-    return true;
+    return TRUE;
 }
 
 wxGLCanvas::~wxGLCanvas(void)