X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54385bdb3f485f25656511b5a6b1b8ced03e0688..72e4e6a397fd04e6d8e0cc5ae22aaba740c3c8bc:/include/wx/x11/glcanvas.h?ds=sidebyside

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index e6aa775e09..d5759175e1 100644
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWindows 2.0 for Motif.
+// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif.
 //              Uses the GLX extension.
 // Author:      Julian Smart and Wolfram Gloger
 // Modified by:
@@ -10,13 +10,13 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "glcanvas.h"
 #endif
 
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
 #include "wx/setup.h"
 
 #if wxUSE_GLCANVAS
@@ -100,21 +100,21 @@ public:
     wxGLCanvas( wxWindow *parent, wxWindowID id = -1, 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
+        long style = 0, const wxString& name = wxT("GLCanvas"), 
         int *attribList = (int*) NULL, 
         const wxPalette& palette = wxNullPalette );
-    wxGLCanvas( wxWindow *parent, const wxGLContext *shared = (wxGLContext *)NULL,
+    wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
         wxWindowID id = -1, 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
+        long style = 0, const wxString& name = wxT("GLCanvas"), 
         int *attribList = (int*) NULL, 
         const wxPalette& palette = wxNullPalette );
-    wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared = (wxGLCanvas *)NULL,
+    wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared,
         wxWindowID id = -1, 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
+        long style = 0, const wxString& name = wxT("GLCanvas"), 
         int *attribList = (int*) NULL, 
         const wxPalette& palette = wxNullPalette );
     
@@ -124,7 +124,7 @@ public:
         wxWindowID id = -1, 
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, 
-        long style = 0, const wxString& name = "GLCanvas", 
+        long style = 0, const wxString& name = wxT("GLCanvas"), 
         int *attribList = (int*) NULL,
         const wxPalette& palette = wxNullPalette );