From 43899bbe0eb11e2f0b0743521bc4b0793a920ba9 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 12 Mar 2018 21:02:04 +0000 Subject: [PATCH] Fix compile issues under some compilers. --- cvpcb/cvpcb_mainframe.cpp | 2 +- gerbview/gerbview_frame.cpp | 3 ++- pcbnew/footprint_edit_frame.cpp | 2 +- pcbnew/pcb_edit_frame.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp index f7f69021ae..6919398773 100644 --- a/cvpcb/cvpcb_mainframe.cpp +++ b/cvpcb/cvpcb_mainframe.cpp @@ -737,7 +737,7 @@ void CVPCB_MAINFRAME::UpdateTitle() { title.Printf( _( "Cvpcb" ) + wxT( " \u2014 %s%s" ), fn.GetFullPath(), - fn.IsFileWritable() ? wxEmptyString : _( " [Read Only]" ) ); + fn.IsFileWritable() ? wxString( wxEmptyString ) : _( " [Read Only]" ) ); } else { diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp index 47592aed65..49c002cbb8 100644 --- a/gerbview/gerbview_frame.cpp +++ b/gerbview/gerbview_frame.cpp @@ -778,7 +778,8 @@ void GERBVIEW_FRAME::UpdateTitleAndInfo() wxString title; title.Printf( _( "GerbView" ) + wxT( " \u2014 %s%s" ), gerber->m_FileName, - gerber->m_IsX2_file ? _( " (with X2 attributes)" ) : wxEmptyString ); + gerber->m_IsX2_file ? _( " (with X2 attributes)" ) + : wxString( wxEmptyString ) ); SetTitle( title ); gerber->DisplayImageInfo( this ); diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp index 7d6a676008..031d230bb2 100644 --- a/pcbnew/footprint_edit_frame.cpp +++ b/pcbnew/footprint_edit_frame.cpp @@ -799,7 +799,7 @@ void FOOTPRINT_EDIT_FRAME::updateTitle() wxString title; title.Printf( _( "Footprint Editor" ) + wxT( " \u2014 %s%s%s" ), nickname_display, - writable ? wxEmptyString : _( " [Read Only]" ), + writable ? wxString( wxEmptyString ) : _( " [Read Only]" ), path_display ); SetTitle( title ); diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index 566e8ee19f..48144f1eb7 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -1112,7 +1112,7 @@ void PCB_EDIT_FRAME::UpdateTitle() if( fileName.IsOk() && fileName.FileExists() ) { - fileinfo = fileName.IsFileWritable() ? wxEmptyString : _( " [Read Only]" ); + fileinfo = fileName.IsFileWritable() ? wxString( wxEmptyString ) : _( " [Read Only]" ); } else {