Fixed strings for wxWidgets 2.8

common/tool/context_menu.cpp

@@ -103,12 +103,13 @@ void CONTEXT_MENU::Add( const TOOL_ACTION& aAction )
     wxString menuEntry;
 
     if( aAction.HasHotKey() )
-        menuEntry = wxString( aAction.GetMenuItem() + '\t' + getHotKeyDescription( aAction ) );
+        menuEntry = wxString( ( aAction.GetMenuItem() + '\t' + getHotKeyDescription( aAction ) ).c_str(),
+        				      wxConvUTF8 );
     else
-        menuEntry = wxString( aAction.GetMenuItem() );
+        menuEntry = wxString( aAction.GetMenuItem().c_str(), wxConvUTF8 );
 
     m_menu.Append( new wxMenuItem( &m_menu, id, menuEntry,
-                    wxString( aAction.GetDescription() ), wxITEM_NORMAL ) );
+                    wxString( aAction.GetDescription().c_str(), wxConvUTF8 ), wxITEM_NORMAL ) );
 
     m_toolActions[id] = &aAction;
 }

common/tool/tool_manager.cpp

@@ -139,7 +139,7 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool )
 		bool initState = static_cast<TOOL_INTERACTIVE*>( aTool )->Init();
 		if( !initState )
 		{
-		    wxLogError( wxT( "Initialization of the %s tool failed" ), aTool->GetName() );
+		    wxLogError( wxT( "Initialization of the %s tool failed" ), aTool->GetName().c_str() );
 
 		    // Unregister the tool
 		    m_toolState.erase( aTool );

common/worksheet_item.cpp

@@ -79,8 +79,8 @@ const BOX2I WORKSHEET_ITEM::ViewBBox() const
 void WORKSHEET_ITEM::ViewDraw( int aLayer, GAL* aGal ) const
 {
     RENDER_SETTINGS* settings = m_view->GetPainter()->GetSettings();
-    wxString fileName( m_fileName );
-    wxString sheetName( m_sheetName );
+    wxString fileName( m_fileName.c_str(), wxConvUTF8 );
+    wxString sheetName( m_sheetName.c_str(), wxConvUTF8 );
     WS_DRAW_ITEM_LIST drawList;
 
     drawList.SetPenSize( settings->GetWorksheetLineWidth() );

pcbnew/tools/move_tool.cpp

@@ -68,7 +68,7 @@ bool MOVE_TOOL::Init()
     }
     else
     {
-        wxLogError( "pcbnew.InteractiveSelection tool is not available" );
+        wxLogError( wxT( "pcbnew.InteractiveSelection tool is not available" ) );
         return false;
     }