X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1807c27dbced16268d76dbdbfdf3f09d2f501b2a..d0e278d98e9ecc0f78943a662fca855811f3bea7:/src/x11/glcanvas.cpp

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 6a6869fc0f..5b619202a0 100644
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -10,7 +10,7 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "glcanvas.h"
 #endif
 
@@ -32,6 +32,10 @@
 #endif
 #include "wx/x11/private.h"
 
+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxGL")
+
 static inline WXWindow wxGetClientAreaWindow(wxWindow* win)
 {
 #ifdef __WXMOTIF__
@@ -69,12 +73,12 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win,
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
     
-    wxCHECK_RET( vi, "invalid visual for OpenGl" );
+    wxCHECK_RET( vi, wxT("invalid visual for OpenGL") );
     
     m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,
                                     None, GL_TRUE);
   
-    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+    wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") );
 }
 
 wxGLContext::wxGLContext( 
@@ -89,7 +93,7 @@ wxGLContext::wxGLContext(
     wxGLCanvas *gc = (wxGLCanvas*) win;
     XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
     
-    wxCHECK_RET( vi, "invalid visual for OpenGl" );
+    wxCHECK_RET( vi, wxT("invalid visual for OpenGL") );
     
     if( other != 0 )
         m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, 
@@ -98,7 +102,7 @@ wxGLContext::wxGLContext(
         m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,
                                         None, GL_TRUE );
     
-    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+    wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") );
 }
 
 wxGLContext::~wxGLContext()
@@ -132,7 +136,7 @@ void wxGLContext::SetCurrent()
     }
 }
 
-void wxGLContext::SetColour(const char *colour)
+void wxGLContext::SetColour(const wxChar *colour)
 {
     wxColour *the_colour = wxTheColourDatabase->FindColour(colour);
     if(the_colour) {
@@ -151,7 +155,7 @@ void wxGLContext::SetColour(const char *colour)
 	    GLint pix = (GLint)the_colour->GetPixel();
 	    if(pix == -1)
             {
-                wxLogError("wxGLCanvas: cannot allocate color\n");
+                wxLogError(wxT("wxGLCanvas: cannot allocate color\n"));
 		return;
             }
 	    glIndexi(pix);
@@ -251,7 +255,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 
     // Check for the presence of the GLX extension
     if(!glXQueryExtension(display, NULL, NULL)) {
-	wxLogDebug("wxGLCanvas: GLX extension is missing\n");
+	wxLogDebug(wxT("wxGLCanvas: GLX extension is missing\n"));
 	return FALSE;
     }
 
@@ -346,7 +350,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 
     m_vi = vi;  // safe for later use
     
-    wxCHECK_MSG( m_vi, FALSE, "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
 
@@ -391,7 +395,7 @@ void wxGLCanvas::SetCurrent()
     // if(glx_cx) glXMakeCurrent(display, (Window) GetClientAreaWindow(), glx_cx);
 }
 
-void wxGLCanvas::SetColour(const char *col)
+void wxGLCanvas::SetColour(const wxChar *col)
 {
     if( m_glContext ) m_glContext->SetColour(col);
 }