Commit 521d73ac authored by Maciej Suminski's avatar Maciej Suminski Committed by Wayne Stambaugh
Browse files

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

parents 17980792 fc4f9195

common/gal/opengl/opengl_gal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 );

}

common/tool/tool_manager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool ) 
    {

        if( !static_cast<TOOL_INTERACTIVE*>( 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 );