KiCad

Merge lp:~cern-kicad/kicad/strings_fix into lp:kicad/product

  1. strings_fix
  2. Merge into product
Proposed by Maciej Suminski
Status: Merged
Merged at revision: 4463
Proposed branch: lp:~cern-kicad/kicad/strings_fix
Merge into: lp:kicad/product
Diff against target: 29 lines (+4/-4)
2 files modified
common/gal/opengl/opengl_gal.cpp (+2/-2)
common/tool/tool_manager.cpp (+2/-2)
To merge this branch: bzr merge lp:~cern-kicad/kicad/strings_fix
Reviewer Review Type Date Requested Status
KiCad Lead Developers Pending
Review via email: mp+195078@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/gal/opengl/opengl_gal.cpp'
2--- common/gal/opengl/opengl_gal.cpp 2013-11-11 09:48:49 +0000
3+++ common/gal/opengl/opengl_gal.cpp 2013-11-13 15:04:16 +0000
4@@ -1053,8 +1053,8 @@
5 {
6 const GLubyte* eString = gluErrorString( aErrorCode );
7
8- DisplayError( NULL, wxString( std::string( "Tessellation error: " ) +
9- std::string( (const char*)( eString ) ) ) );
10+ DisplayError( NULL, wxT( "Tessellation error: " ) +
11+ wxString( (const char*)( eString ), wxConvUTF8 ) );
12
13 exit( 1 );
14 }
15
16=== modified file 'common/tool/tool_manager.cpp'
17--- common/tool/tool_manager.cpp 2013-11-11 09:48:49 +0000
18+++ common/tool/tool_manager.cpp 2013-11-13 15:04:16 +0000
19@@ -139,8 +139,8 @@
20 {
21 if( !static_cast<TOOL_INTERACTIVE*>( aTool )->Init() )
22 {
23- DisplayError( NULL, wxString( std::string( "Initialization of the %s tool failed" ) +
24- aTool->GetName() ) );
25+ DisplayError( NULL, wxT( "Initialization of the %s tool failed" ) +
26+ wxString( aTool->GetName().c_str(), wxConvUTF8 ) );
27
28 // Unregister the tool
29 m_toolState.erase( aTool );