Fix [ 1574240 ] wx.RadioButton doesn't navigate correctly

[wxWidgets.git] / src / x11 / glcanvas.cpp

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 9ab1474b9cbd6e76c7bfe07f781a1f9de5c8b100..c6aa213acc59de575ee3bb190ab5ce2b51c348ea 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -14,15 +14,18 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_GLCANVAS
 
 #include "wx/glcanvas.h"
 #endif
 
 #if wxUSE_GLCANVAS
 
 #include "wx/glcanvas.h"

-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif

 
 #ifdef __VMS
 # pragma message disable nosimpint
 
 #ifdef __VMS
 # pragma message disable nosimpint


@@ -311,7 +314,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
       attribList = (int*) data;
       // Get an appropriate visual
       vi = glXChooseVisual(display, DefaultScreen(display), attribList);
       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,
 
       // Here we should make sure that vi is the same visual as the
       // one used by the xwindow drawable in wxCanvas.  However,


@@ -322,9 +325,9 @@ bool wxGLCanvas::Create( wxWindow *parent,
       XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &xwa);
       vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
       vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
       XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &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);
       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.
       // 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.


@@ -351,13 +354,13 @@ bool wxGLCanvas::Create( wxWindow *parent,
       a_list[n] = None;
       // XFree(vi);
       vi = glXChooseVisual(display, DefaultScreen(display), a_list);
       a_list[n] = None;
       // XFree(vi);
       vi = glXChooseVisual(display, DefaultScreen(display), a_list);

-      if(!vi) return FALSE;
+      if(!vi) return false;

 #endif /* OLD_MESA */
     }
 
     m_vi = vi;  // safe for later use
 
 #endif /* OLD_MESA */
     }
 
     m_vi = vi;  // safe for later use
 

-    wxCHECK_MSG( m_vi, FALSE, wxT("required visual couldn't be found") );
+    wxCHECK_MSG( m_vi, false, wxT("required visual couldn't be found") );

 
     // Create the GLX context and make it current
 
 
     // Create the GLX context and make it current