From 57c66a50aced0889d4906dac38972c3666d1da2c Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 15 Jan 2023 20:22:17 -0500 Subject: [PATCH] Add some missing wxS wraps --- common/build_version.cpp | 2 +- common/dialog_about/AboutDialog_main.cpp | 2 +- eeschema/sch_plugins/altium/sch_altium_plugin.cpp | 2 +- eeschema/schematic_settings.cpp | 4 ++-- eeschema/tools/sch_editor_control.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/build_version.cpp b/common/build_version.cpp index 5abce079c7..8de4993fb2 100644 --- a/common/build_version.cpp +++ b/common/build_version.cpp @@ -137,7 +137,7 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief ) #define OFF "OFF" << eol wxString version; - version << ( KIPLATFORM::APP::IsOperatingSystemUnsupported() ? "(UNSUPPORTED)" + version << ( KIPLATFORM::APP::IsOperatingSystemUnsupported() ? wxString( wxS( "(UNSUPPORTED)" ) ) : GetBuildVersion() ) #ifdef DEBUG << ", debug" diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index a844585e48..7ef8d66656 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -68,7 +68,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf /* KiCad build version */ wxString version; - version << ( KIPLATFORM::APP::IsOperatingSystemUnsupported() ? "(UNSUPPORTED)" + version << ( KIPLATFORM::APP::IsOperatingSystemUnsupported() ? wxString( wxS( "(UNSUPPORTED)" ) ) : GetBuildVersion() ) #ifdef DEBUG << ", debug" diff --git a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp index 6fd658a6cb..5b97b29aa4 100644 --- a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp +++ b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp @@ -2902,7 +2902,7 @@ void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map& aPr // Graphics symbols have no reference. '#GRAPHIC' allows them to not have footprint associated. // Note: not all unnamed imported symbols are necessarily graphics. bool emptyRef = elem.text.IsEmpty(); - symbol->SetRef( &m_sheetPath, emptyRef ? "#GRAPHIC" : elem.text ); + symbol->SetRef( &m_sheetPath, emptyRef ? wxString( wxS( "#GRAPHIC" ) ) : elem.text ); // I am not sure value and ref should be invisible just because emptyRef is true // I have examples with this criteria fully incorrect. diff --git a/eeschema/schematic_settings.cpp b/eeschema/schematic_settings.cpp index 700a3918a6..16c6403d90 100644 --- a/eeschema/schematic_settings.cpp +++ b/eeschema/schematic_settings.cpp @@ -76,9 +76,9 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin bool defaultIntersheetsRefFormatShort = appSettings ? appSettings->m_Drawing.intersheets_ref_short : false; wxString defaultIntersheetsRefPrefix = - appSettings ? appSettings->m_Drawing.intersheets_ref_prefix : DEFAULT_IREF_PREFIX; + appSettings ? appSettings->m_Drawing.intersheets_ref_prefix : wxString( wxS( DEFAULT_IREF_PREFIX ) ); wxString defaultIntersheetsRefSuffix = - appSettings ? appSettings->m_Drawing.intersheets_ref_suffix : DEFAULT_IREF_SUFFIX; + appSettings ? appSettings->m_Drawing.intersheets_ref_suffix : wxString( wxS( DEFAULT_IREF_SUFFIX ) ); m_params.emplace_back( new PARAM( "drawing.intersheets_ref_show", &m_IntersheetRefsShow, defaultIntersheetsRefShow ) ); diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp index d2c09d7f70..3031f689a6 100644 --- a/eeschema/tools/sch_editor_control.cpp +++ b/eeschema/tools/sch_editor_control.cpp @@ -954,7 +954,7 @@ int SCH_EDITOR_CONTROL::UpdateNetHighlighting( const TOOL_EVENT& aEvent ) return 0; bool selectedIsBus = selectedConn ? selectedConn->IsBus() : false; - wxString selectedName = selectedConn ? selectedConn->Name() : ""; + wxString selectedName = selectedConn ? selectedConn->Name() : wxString( wxS( "" ) ); bool selectedIsNoNet = false; CONNECTION_SUBGRAPH* selectedSubgraph = nullptr;