Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode compilation fixes for wxX11

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-20 08:39:47 +00:00
parent c6441a0d74
commit 54385bdb3f
8 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/x11/glcanvas.cpp
View File

@@ -73,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(
@@ -93,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,
@@ -102,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()
@@ -136,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) {
@@ -155,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);
@@ -255,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;
}
@@ -350,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
@@ -395,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);
}