WinCE patches from "Viktor Voroshylo" <viktor@voroshylo.com>

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

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 146597dc469e007b09b354f3b968346197fe8dd4..88018d4bb84fd2792800062e556b2e55a395857e 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -1,18 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        glcanvas.cpp
+// Name:        gtk/glcanvas.cpp

 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/08/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/08/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "glcanvas.h"
 #endif
 
 #pragma implementation "glcanvas.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/setup.h"
 
 #if wxUSE_GLCANVAS
 #include "wx/setup.h"
 
 #if wxUSE_GLCANVAS


@@ -24,7 +27,8 @@
 #include "wx/module.h"
 #include "wx/app.h"
 
 #include "wx/module.h"
 #include "wx/app.h"
 

-extern "C" {
+extern "C"
+{

 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 #include "gdk/gdkx.h"
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 #include "gdk/gdkx.h"


@@ -32,6 +36,10 @@ extern "C" {
 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+

 //---------------------------------------------------------------------------
 // global data
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // global data
 //---------------------------------------------------------------------------


@@ -58,16 +66,16 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette&
 
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
 
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;

-    
-    wxCHECK_RET( vi, "invalid visual for OpenGl" );
-    
+
+    wxCHECK_RET( vi, _T("invalid visual for OpenGl") );
+

     m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE );
     m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE );

-  
-    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+
+    wxCHECK_RET( m_glContext, _T("Couldn't create OpenGl context") );

 }
 
 }
 

-wxGLContext::wxGLContext( 
-               bool WXUNUSED(isRGB), wxWindow *win, 
+wxGLContext::wxGLContext(
+               bool WXUNUSED(isRGB), wxWindow *win,

                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
 )
                const wxPalette& WXUNUSED(palette),
                const wxGLContext *other        /* for sharing display lists */
 )


@@ -77,26 +85,28 @@ wxGLContext::wxGLContext(
 
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
 
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;

-    
-    wxCHECK_RET( vi, "invalid visual for OpenGl" );
-    
-    if( other != 0 )
-        m_glContext = glXCreateContext( GDK_DISPLAY(), vi, other->m_glContext, GL_TRUE );
-    else
-        m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE );
-    
-    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+
+    wxCHECK_RET( vi, _T("invalid visual for OpenGl") );
+
+    m_glContext = glXCreateContext( GDK_DISPLAY(), vi,
+                                    other ? other->m_glContext : None,
+                                    GL_TRUE );
+
+    if ( !m_glContext )
+    {
+        wxFAIL_MSG( _T("Couldn't create OpenGl context") );
+    }

 }
 
 wxGLContext::~wxGLContext()
 {
     if (!m_glContext) return;
 }
 
 wxGLContext::~wxGLContext()
 {
     if (!m_glContext) return;

-    
+

     if (m_glContext == glXGetCurrentContext())
     {
         glXMakeCurrent( GDK_DISPLAY(), None, NULL);
     }
     if (m_glContext == glXGetCurrentContext())
     {
         glXMakeCurrent( GDK_DISPLAY(), None, NULL);
     }

-       
+

     glXDestroyContext( GDK_DISPLAY(), m_glContext );
 }
 
     glXDestroyContext( GDK_DISPLAY(), m_glContext );
 }
 


@@ -111,24 +121,21 @@ void wxGLContext::SwapBuffers()
 
 void wxGLContext::SetCurrent()
 {
 
 void wxGLContext::SetCurrent()
 {

-    if (m_glContext) 
-    { 
+    if (m_glContext)
+    {

         GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
         glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext );
     }
 }
 
         GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
         glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext );
     }
 }
 

-void wxGLContext::SetColour(const char *colour)
+void wxGLContext::SetColour(const wxChar *colour)

 {
 {

-    float r = 0.0;
-    float g = 0.0;
-    float b = 0.0;
-    wxColour *col = wxTheColourDatabase->FindColour(colour);
-    if (col)
+    wxColour col = wxTheColourDatabase->Find(colour);
+    if (col.Ok())

     {
     {

-        r = (float)(col->Red()/256.0);
-        g = (float)(col->Green()/256.0);
-        b = (float)(col->Blue()/256.0);
+        float r = (float)(col.Red()/256.0);
+        float g = (float)(col.Green()/256.0);
+        float b = (float)(col.Blue()/256.0);

         glColor3f( r, g, b);
     }
 }
         glColor3f( r, g, b);
     }
 }


@@ -185,10 +192,10 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 // "expose_event" of m_wxwindow
 //-----------------------------------------------------------------------------
 
 // "expose_event" of m_wxwindow
 //-----------------------------------------------------------------------------
 

-static void 
+static void

 gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
 {
 gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     win->m_exposed = TRUE;
         wxapp_install_idle_handler();
 
     win->m_exposed = TRUE;


@@ -203,10 +210,11 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
 // "draw" of m_wxwindow
 //-----------------------------------------------------------------------------
 
 // "draw" of m_wxwindow
 //-----------------------------------------------------------------------------
 

-static void 
+#ifndef __WXGTK20__
+static void

 gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win )
 {
 gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     win->m_exposed = TRUE;
         wxapp_install_idle_handler();
 
     win->m_exposed = TRUE;


@@ -214,12 +222,13 @@ gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxG
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
 }
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
 }

+#endif

 
 //-----------------------------------------------------------------------------
 // "size_allocate" of m_wxwindow
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "size_allocate" of m_wxwindow
 //-----------------------------------------------------------------------------
 

-static void 
+static void

 gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win )
 {
     if (g_isIdle)
 gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win )
 {
     if (g_isIdle)


@@ -244,77 +253,84 @@ BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
 END_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id,
 END_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id,

-                        const wxPoint& pos, const wxSize& size, 
-                       long style, const wxString& name,
-                        int *attribList, 
-                       const wxPalette& palette )
+                        const wxPoint& pos, const wxSize& size,
+                        long style, const wxString& name,
+                        int *attribList,
+                        const wxPalette& palette )

 {
     Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette );
 }
 
 {
     Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette );
 }
 

-wxGLCanvas::wxGLCanvas( wxWindow *parent, 
+wxGLCanvas::wxGLCanvas( wxWindow *parent,

                         const wxGLContext *shared,
                         wxWindowID id,
                         const wxGLContext *shared,
                         wxWindowID id,

-                        const wxPoint& pos, const wxSize& size, 
-                       long style, const wxString& name,
-                        int *attribList, 
-                       const wxPalette& palette )
-{                      
+                        const wxPoint& pos, const wxSize& size,
+                        long style, const wxString& name,
+                        int *attribList,
+                        const wxPalette& palette )
+{

     Create( parent, shared, NULL, id, pos, size, style, name, attribList, palette );
 }
 
     Create( parent, shared, NULL, id, pos, size, style, name, attribList, palette );
 }
 

-wxGLCanvas::wxGLCanvas( wxWindow *parent, 
+wxGLCanvas::wxGLCanvas( wxWindow *parent,

                         const wxGLCanvas *shared,
                         wxWindowID id,
                         const wxGLCanvas *shared,
                         wxWindowID id,

-                        const wxPoint& pos, const wxSize& size, 
-                       long style, const wxString& name,
-                        int *attribList, 
-                       const wxPalette& palette )
-{                      
+                        const wxPoint& pos, const wxSize& size,
+                        long style, const wxString& name,
+                        int *attribList,
+                        const wxPalette& palette )
+{

     Create( parent, NULL, shared, id, pos, size, style, name, attribList, palette );
 }
 
     Create( parent, NULL, shared, id, pos, size, style, name, attribList, palette );
 }
 

-bool wxGLCanvas::Create( wxWindow *parent, 
+bool wxGLCanvas::Create( wxWindow *parent,

                          const wxGLContext *shared,
                          const wxGLCanvas *shared_context_of,
                          wxWindowID id,
                          const wxGLContext *shared,
                          const wxGLCanvas *shared_context_of,
                          wxWindowID id,

-                         const wxPoint& pos, const wxSize& size, 
-                        long style, const wxString& name,
-                         int *attribList, 
-                        const wxPalette& palette)
+                         const wxPoint& pos, const wxSize& size,
+                         long style, const wxString& name,
+                         int *attribList,
+                         const wxPalette& palette)

 {
     m_sharedContext = (wxGLContext*)shared;  // const_cast
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 {
     m_sharedContext = (wxGLContext*)shared;  // const_cast
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;

-    
+

     m_exposed = FALSE;
     m_noExpose = TRUE;
     m_nativeSizeEvent = TRUE;
     m_exposed = FALSE;
     m_noExpose = TRUE;
     m_nativeSizeEvent = TRUE;

-    
+

     XVisualInfo *vi = NULL;
     XVisualInfo *vi = NULL;

-    if (wxTheApp->m_glVisualInfo != NULL) {
-        vi = (XVisualInfo *) wxTheApp->m_glVisualInfo; 
+    if (wxTheApp->m_glVisualInfo != NULL)
+    {
+        vi = (XVisualInfo *) wxTheApp->m_glVisualInfo;

         m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction
         m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction

-    } else {
+    }
+    else
+    {

         vi = (XVisualInfo *) ChooseGLVisual(attribList);
         m_canFreeVi = TRUE;
     }
     m_vi = vi;  // save for later use
         vi = (XVisualInfo *) ChooseGLVisual(attribList);
         m_canFreeVi = TRUE;
     }
     m_vi = vi;  // save for later use

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

 
     GdkVisual *visual = gdkx_visual_get( vi->visualid );
     GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(vi->visualid), TRUE );
 
     GdkVisual *visual = gdkx_visual_get( vi->visualid );
     GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(vi->visualid), TRUE );

-    
+

     gtk_widget_push_colormap( colormap );
     gtk_widget_push_visual( visual );
 
     wxWindow::Create( parent, id, pos, size, style, name );
 
     m_glWidget = m_wxwindow;
     gtk_widget_push_colormap( colormap );
     gtk_widget_push_visual( visual );
 
     wxWindow::Create( parent, id, pos, size, style, name );
 
     m_glWidget = m_wxwindow;

-    
+
+#ifdef __WXGTK20__
+    gtk_widget_set_double_buffered( m_glWidget, FALSE );
+#endif
+

     gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );
     gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );

-    
+

     gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
                             GTK_SIGNAL_FUNC(gtk_glwindow_realized_callback), (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
                             GTK_SIGNAL_FUNC(gtk_glwindow_realized_callback), (gpointer) this );
 


@@ -324,28 +340,30 @@ bool wxGLCanvas::Create( wxWindow *parent,
     gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
         GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
         GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this );
 

+#ifndef __WXGTK20__

     gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
         GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this );
     gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
         GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this );

-       
+#endif
+

     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
 
     gtk_widget_pop_visual();
     gtk_widget_pop_colormap();
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
 
     gtk_widget_pop_visual();
     gtk_widget_pop_colormap();

-    
+

     if (GTK_WIDGET_REALIZED(m_wxwindow))
         gtk_glwindow_realized_callback( m_wxwindow, this );
     if (GTK_WIDGET_REALIZED(m_wxwindow))
         gtk_glwindow_realized_callback( m_wxwindow, this );

-    
+

     if (GTK_WIDGET_MAPPED(m_wxwindow))
         gtk_glwindow_map_callback( m_wxwindow, this );
     if (GTK_WIDGET_MAPPED(m_wxwindow))
         gtk_glwindow_map_callback( m_wxwindow, this );

-    
+

     return TRUE;
 }
 
 wxGLCanvas::~wxGLCanvas()
 {
     XVisualInfo *vi = (XVisualInfo *) m_vi;
     return TRUE;
 }
 
 wxGLCanvas::~wxGLCanvas()
 {
     XVisualInfo *vi = (XVisualInfo *) m_vi;

-    
+

     if (vi && m_canFreeVi) XFree( vi );
     if (m_glContext) delete m_glContext;
 }
     if (vi && m_canFreeVi) XFree( vi );
     if (m_glContext) delete m_glContext;
 }


@@ -365,12 +383,12 @@ void* wxGLCanvas::ChooseGLVisual(int *attribList)
         data[10] = GLX_ALPHA_SIZE;  data[11] = 0;
         data[12] = None;
 
         data[10] = GLX_ALPHA_SIZE;  data[11] = 0;
         data[12] = None;
 

-       attribList = (int*) data;
+        attribList = (int*) data;

     }
     else
     {
       int arg=0, p=0;
     }
     else
     {
       int arg=0, p=0;

-       
+

       while( (attribList[arg]!=0) && (p<510) )
       {
         switch( attribList[arg++] )
       while( (attribList[arg]!=0) && (p<510) )
       {
         switch( attribList[arg++] )


@@ -392,9 +410,9 @@ void* wxGLCanvas::ChooseGLVisual(int *attribList)
             data[p++]=GLX_BLUE_SIZE; data[p++]=attribList[arg++]; break;
           case WX_GL_MIN_ALPHA:
             data[p++]=GLX_ALPHA_SIZE; data[p++]=attribList[arg++]; break;
             data[p++]=GLX_BLUE_SIZE; data[p++]=attribList[arg++]; break;
           case WX_GL_MIN_ALPHA:
             data[p++]=GLX_ALPHA_SIZE; data[p++]=attribList[arg++]; break;

-          case WX_GL_DEPTH_SIZE: 
+          case WX_GL_DEPTH_SIZE:

             data[p++]=GLX_DEPTH_SIZE; data[p++]=attribList[arg++]; break;
             data[p++]=GLX_DEPTH_SIZE; data[p++]=attribList[arg++]; break;

-          case WX_GL_STENCIL_SIZE: 
+          case WX_GL_STENCIL_SIZE:

             data[p++]=GLX_STENCIL_SIZE; data[p++]=attribList[arg++]; break;
           case WX_GL_MIN_ACCUM_RED:
             data[p++]=GLX_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break;
             data[p++]=GLX_STENCIL_SIZE; data[p++]=attribList[arg++]; break;
           case WX_GL_MIN_ACCUM_RED:
             data[p++]=GLX_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break;


@@ -407,48 +425,38 @@ void* wxGLCanvas::ChooseGLVisual(int *attribList)
           default:
             break;
         }
           default:
             break;
         }

-      }       
-      data[p] = 0; 
+      }
+      data[p] = 0;

 
       attribList = (int*) data;
     }
 
       attribList = (int*) data;
     }

-    
-    
+
+

     Display *dpy = GDK_DISPLAY();
     Display *dpy = GDK_DISPLAY();

-    
+

     return glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
 }
 
 void wxGLCanvas::SwapBuffers()
 {
     return glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
 }
 
 void wxGLCanvas::SwapBuffers()
 {

-    if (m_glContext) m_glContext->SwapBuffers();
+    if (m_glContext)
+        m_glContext->SwapBuffers();

 }
 
 void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 }
 
 void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {

-    int width, height;
-    GetClientSize( &width, &height );
-    
-    if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
-    {
-        SetCurrent(); 
-       
-        glViewport(0, 0, (GLint)width, (GLint)height );
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
-        glMatrixMode(GL_MODELVIEW);
-    }

 }
 
 void wxGLCanvas::SetCurrent()
 {
 }
 
 void wxGLCanvas::SetCurrent()
 {

-    if (m_glContext) m_glContext->SetCurrent();
+    if (m_glContext)
+        m_glContext->SetCurrent();

 }
 
 }
 

-void wxGLCanvas::SetColour( const char *colour )
+void wxGLCanvas::SetColour( const wxChar *colour )

 {
 {

-    if (m_glContext) m_glContext->SetColour( colour );
+    if (m_glContext)
+        m_glContext->SetColour( colour );

 }
 
 void wxGLCanvas::OnInternalIdle()
 }
 
 void wxGLCanvas::OnInternalIdle()


@@ -462,7 +470,7 @@ void wxGLCanvas::OnInternalIdle()
         m_exposed = FALSE;
         GetUpdateRegion().Clear();
     }
         m_exposed = FALSE;
         GetUpdateRegion().Clear();
     }

-    
+

     wxWindow::OnInternalIdle();
 }
 
     wxWindow::OnInternalIdle();
 }
 


@@ -473,17 +481,21 @@ void wxGLCanvas::OnInternalIdle()
 //---------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxGLApp, wxApp)
 //---------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxGLApp, wxApp)

-        
+

 wxGLApp::~wxGLApp()
 {
 wxGLApp::~wxGLApp()
 {

-    if (m_glVisualInfo) XFree(m_glVisualInfo);
+    if (m_glVisualInfo)
+        XFree(m_glVisualInfo);

 }
 
 bool wxGLApp::InitGLVisual(int *attribList)
 {
 }
 
 bool wxGLApp::InitGLVisual(int *attribList)
 {

-    if (m_glVisualInfo) XFree(m_glVisualInfo);
+    if (m_glVisualInfo)
+        XFree(m_glVisualInfo);
+

     m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList);
     m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList);

-    return (m_glVisualInfo != NULL);
+
+    return m_glVisualInfo != NULL;

 }
 
 #endif
 }
 
 #endif