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

Fix compile issues under some compilers.

This commit is contained in:
Jeff Young 2018-03-12 21:02:04 +00:00
parent 3d32ee774e
commit 43899bbe0e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cvpcb/cvpcb_mainframe.cpp
View File

@ -737,7 +737,7 @@ void CVPCB_MAINFRAME::UpdateTitle()
{ {
title.Printf( _( "Cvpcb" ) + wxT( " \u2014 %s%s" ), title.Printf( _( "Cvpcb" ) + wxT( " \u2014 %s%s" ),
fn.GetFullPath(), fn.GetFullPath(),
fn.IsFileWritable() ? wxEmptyString : _( " [Read Only]" ) ); fn.IsFileWritable() ? wxString( wxEmptyString ) : _( " [Read Only]" ) );
} }
else else
{ {

3
gerbview/gerbview_frame.cpp
View File

@ -778,7 +778,8 @@ void GERBVIEW_FRAME::UpdateTitleAndInfo()
wxString title; wxString title;
title.Printf( _( "GerbView" ) + wxT( " \u2014 %s%s" ), title.Printf( _( "GerbView" ) + wxT( " \u2014 %s%s" ),
gerber->m_FileName, gerber->m_FileName,
gerber->m_IsX2_file ? _( " (with X2 attributes)" ) : wxEmptyString ); gerber->m_IsX2_file ? _( " (with X2 attributes)" )
: wxString( wxEmptyString ) );
SetTitle( title ); SetTitle( title );
gerber->DisplayImageInfo( this ); gerber->DisplayImageInfo( this );

2
pcbnew/footprint_edit_frame.cpp
View File

@ -799,7 +799,7 @@ void FOOTPRINT_EDIT_FRAME::updateTitle()
wxString title; wxString title;
title.Printf( _( "Footprint Editor" ) + wxT( " \u2014 %s%s%s" ), title.Printf( _( "Footprint Editor" ) + wxT( " \u2014 %s%s%s" ),
nickname_display, nickname_display,
writable ? wxEmptyString : _( " [Read Only]" ), writable ? wxString( wxEmptyString ) : _( " [Read Only]" ),
path_display ); path_display );
SetTitle( title ); SetTitle( title );

2
pcbnew/pcb_edit_frame.cpp
View File

@ -1112,7 +1112,7 @@ void PCB_EDIT_FRAME::UpdateTitle()
if( fileName.IsOk() && fileName.FileExists() ) if( fileName.IsOk() && fileName.FileExists() )
{ {
fileinfo = fileName.IsFileWritable() ? wxEmptyString : _( " [Read Only]" ); fileinfo = fileName.IsFileWritable() ? wxString( wxEmptyString ) : _( " [Read Only]" );
} }
else else
{ {