From dd93dea448cef6a3e434e62cb4a10cbdd3bd8fc6 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 9 Jul 2014 15:10:32 +0200
Subject: [PATCH] wxWidgets 2.8 compatibility fixes.

---
 pcbnew/tools/module_tools.cpp   | 2 +-
 pcbnew/tools/placement_tool.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcbnew/tools/module_tools.cpp b/pcbnew/tools/module_tools.cpp
index e9302b6c60..cf9a142448 100644
--- a/pcbnew/tools/module_tools.cpp
+++ b/pcbnew/tools/module_tools.cpp
@@ -305,7 +305,7 @@ int MODULE_TOOLS::EnumeratePads( TOOL_EVENT& aEvent )
             m_frame->SaveCopyInUndoList( module, UR_MODEDIT );
 
             BOOST_FOREACH( D_PAD* pad, pads )
-                pad->SetPadName( wxString::Format( "%s%d", padPrefix, padNumber++ ) );
+                pad->SetPadName( wxString::Format( wxT( "%s%d" ), padPrefix.c_str(), padNumber++ ) );
 
             break;
         }
diff --git a/pcbnew/tools/placement_tool.cpp b/pcbnew/tools/placement_tool.cpp
index 82d7570e5e..d77f05089b 100644
--- a/pcbnew/tools/placement_tool.cpp
+++ b/pcbnew/tools/placement_tool.cpp
@@ -63,7 +63,7 @@ bool PLACEMENT_TOOL::Init()
     menu->AppendSeparator();
     menu->Add( COMMON_ACTIONS::distributeHorizontally );
     menu->Add( COMMON_ACTIONS::distributeVertically );
-    m_selectionTool->AddSubMenu( menu, wxString( "Align/distribute" ),
+    m_selectionTool->AddSubMenu( menu, _( "Align/distribute" ),
                                  SELECTION_CONDITIONS::MoreThan( 1 ) );
 
     setTransitions();