Skip to content

K
kicad-source-mirror
Commit 521d73ac authored by Maciej Suminski's avatar Maciej Suminski Committed by Wayne Stambaugh
Browse files
Options

Fix wx2.8 strings compatibility. (fixes lp:1250876)

parents 17980792 fc4f9195
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
common/gal/opengl/opengl_gal.cpp
View file @ 521d73ac
...@@ -1053,8 +1053,8 @@ void CALLBACK ErrorCallback( GLenum aErrorCode ) ...@@ -1053,8 +1053,8 @@ void CALLBACK ErrorCallback( GLenum aErrorCode )
{ {
const GLubyte* eString = gluErrorString( aErrorCode ); const GLubyte* eString = gluErrorString( aErrorCode );
DisplayError( NULL, wxString( std::string( "Tessellation error: " ) + DisplayError( NULL, wxT( "Tessellation error: " ) +
std::string( (const char*)( eString ) ) ) ); wxString( (const char*)( eString ), wxConvUTF8 ) );
exit( 1 ); exit( 1 );
} }
......
common/tool/tool_manager.cpp
View file @ 521d73ac
...@@ -139,8 +139,8 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool ) ...@@ -139,8 +139,8 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool )
{ {
if( !static_cast<TOOL_INTERACTIVE*>( aTool )->Init() ) if( !static_cast<TOOL_INTERACTIVE*>( aTool )->Init() )
{ {
DisplayError( NULL, wxString( std::string( "Initialization of the %s tool failed" ) + DisplayError( NULL, wxT( "Initialization of the %s tool failed" ) +
aTool->GetName() ) ); wxString( aTool->GetName().c_str(), wxConvUTF8 ) );
// Unregister the tool // Unregister the tool
m_toolState.erase( aTool ); m_toolState.erase( aTool );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment