X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..b0fb0f3c71c527b5c5cb839355c88766b6f8c888:/include/wx/x11/glcanvas.h

diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 1932fef522..8a409f79e4 100644
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -10,7 +10,7 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "glcanvas.h"
 #endif
 
@@ -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);