From 5761c182ee5b90f322881d5665c91757ede45e6b Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@verizon.net>
Date: Wed, 18 Sep 2013 07:15:17 -0400
Subject: [PATCH] Fix std::string to wxString conversion bug in Pcbnew. (fixes
 lp:1226670)

---
 pcbnew/xchgmod.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp
index 11dbbf7b5d..b2cc016880 100644
--- a/pcbnew/xchgmod.cpp
+++ b/pcbnew/xchgmod.cpp
@@ -324,14 +324,15 @@ void DIALOG_EXCHANGE_MODULE::Change_ModuleId( bool aUseValue )
         check_module_value = true;
         value = m_CurrentModule->GetValue();
         msg.Printf( _( "Change modules %s -> %s (for value = %s)?" ),
-                    m_CurrentModule->GetFPID().Format().c_str(),
+                    GetChars( FROM_UTF8( m_CurrentModule->GetFPID().Format().c_str() ) ),
                     GetChars( newmodulename ),
                     GetChars( m_CurrentModule->GetValue() ) );
     }
     else
     {
         msg.Printf( _( "Change modules %s -> %s ?" ),
-                    lib_reference.GetFootprintName().c_str(), GetChars( newmodulename ) );
+                    GetChars( FROM_UTF8( lib_reference.Format().c_str() ) ),
+                    GetChars( newmodulename ) );
     }
 
     if( !IsOK( this, msg ) )