partially reverted Robert's changes, did it more cleanly

[wxWidgets.git] / include / wx / x11 / glcanvas.h

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 1932fef522927c290386ff49e55585cf0dd13540..575faeaf99e086c5a850aaa1d955d6e7f00ab6e1 100644 (file)
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma interface "glcanvas.h"
-#endif
-
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "glcanvas.h"
+#endif
+
 #include "wx/setup.h"
 
 #if wxUSE_GLCANVAS
@@ -64,7 +64,7 @@ public:
     ~wxGLContext();
     
     void SetCurrent();
-    void SetColour(const char *colour);
+    void SetColour(const wxChar *colour);
     void SwapBuffers();
     
     void SetupPixelFormat();
@@ -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,
         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,
         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,14 +124,14 @@ 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 );
     
     ~wxGLCanvas();
     
     void SetCurrent();
-    void SetColour(const char *colour);
+    void SetColour(const wxChar *colour);
     void SwapBuffers();
     
     // void OnSize(wxSizeEvent& event);