From fc4f9195b6778d81dd3648739c1d080a9577ed8f Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Wed, 13 Nov 2013 15:52:06 +0100 Subject: [PATCH] Fixed wx2.8 strings compatibility. --- common/gal/opengl/opengl_gal.cpp | 4 ++-- common/tool/tool_manager.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp index d01a90a426..970cc32d16 100644 --- a/common/gal/opengl/opengl_gal.cpp +++ b/common/gal/opengl/opengl_gal.cpp @@ -1053,8 +1053,8 @@ void CALLBACK ErrorCallback( GLenum aErrorCode ) { const GLubyte* eString = gluErrorString( aErrorCode ); - DisplayError( NULL, wxString( std::string( "Tessellation error: " ) + - std::string( (const char*)( eString ) ) ) ); + DisplayError( NULL, wxT( "Tessellation error: " ) + + wxString( (const char*)( eString ), wxConvUTF8 ) ); exit( 1 ); } diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp index a2534c0623..77b828a8ba 100644 --- a/common/tool/tool_manager.cpp +++ b/common/tool/tool_manager.cpp @@ -139,8 +139,8 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool ) { if( !static_cast( aTool )->Init() ) { - DisplayError( NULL, wxString( std::string( "Initialization of the %s tool failed" ) + - aTool->GetName() ) ); + DisplayError( NULL, wxT( "Initialization of the %s tool failed" ) + + wxString( aTool->GetName().c_str(), wxConvUTF8 ) ); // Unregister the tool m_toolState.erase( aTool );