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

Add some missing wxS wraps

This commit is contained in:
Marek Roszko 2023-01-15 20:22:17 -05:00
parent addaad4a96
commit 57c66a50ac
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build_version.cpp
View File

@ -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"

2
common/dialog_about/AboutDialog_main.cpp
View File

@ -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"

2
eeschema/sch_plugins/altium/sch_altium_plugin.cpp
View File

@ -2902,7 +2902,7 @@ void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map<wxString, wxString>& 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.

4
eeschema/schematic_settings.cpp
View File

@ -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<bool>( "drawing.intersheets_ref_show",
&m_IntersheetRefsShow, defaultIntersheetsRefShow ) );

2
eeschema/tools/sch_editor_control.cpp
View File

@ -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;