haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed wx2.8 strings compatibility.

This commit is contained in:
Maciej Suminski 2013-11-13 15:52:06 +01:00
parent 179807922d
commit fc4f9195b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/gal/opengl/opengl_gal.cpp
View File

@ -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 );
} }

4
common/tool/tool_manager.cpp
View File

@ -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 );