haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed strings for wxWidgets 2.8

This commit is contained in:
Maciej Sumiński 2013-09-29 12:57:20 +02:00
parent 35721397bd
commit e1290101aa
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/tool/context_menu.cpp
View File

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

2
common/tool/tool_manager.cpp
View File

@ -139,7 +139,7 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool )
bool initState = static_cast<TOOL_INTERACTIVE*>( aTool )->Init(); bool initState = static_cast<TOOL_INTERACTIVE*>( aTool )->Init();
if( !initState ) 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 // Unregister the tool
m_toolState.erase( aTool ); m_toolState.erase( aTool );

4
common/worksheet_item.cpp
View File

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

2
pcbnew/tools/move_tool.cpp
View File

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