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

Fix build error on MSVC.

This commit is contained in:
Alex Shvartzkop 2024-06-11 00:06:30 +03:00
parent 9d9028c979
commit 35d60598d5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eeschema/sch_io/eagle/sch_io_eagle.cpp
View File

@ -433,7 +433,7 @@ SCH_SHEET* SCH_IO_EAGLE::LoadSchematicFile( const wxString& aFileName, SCHEMATIC
// If the attribute is found, store the Eagle version; // If the attribute is found, store the Eagle version;
// otherwise, store the dummy "0.0" version. // otherwise, store the dummy "0.0" version.
m_version = ( m_eagleDoc->version.IsEmpty() ) ? wxS( "0.0" ) : m_eagleDoc->version; m_version = ( m_eagleDoc->version.IsEmpty() ) ? wxString( wxS( "0.0" ) ) : m_eagleDoc->version;
// Load drawing // Load drawing
loadDrawing( m_eagleDoc->drawing ); loadDrawing( m_eagleDoc->drawing );
@ -546,7 +546,7 @@ void SCH_IO_EAGLE::ensureLoadedLibrary( const wxString& aLibraryPath )
// If the attribute is found, store the Eagle version; // If the attribute is found, store the Eagle version;
// otherwise, store the dummy "0.0" version. // otherwise, store the dummy "0.0" version.
m_version = ( doc->version.IsEmpty() ) ? wxS( "0.0" ) : doc->version; m_version = ( doc->version.IsEmpty() ) ? wxString( wxS( "0.0" ) ) : doc->version;
// Load drawing // Load drawing
loadDrawing( doc->drawing ); loadDrawing( doc->drawing );
@ -2503,7 +2503,8 @@ SCH_TEXT* SCH_IO_EAGLE::loadSymbolText( std::unique_ptr<LIB_SYMBOL>& aSymbol,
adjustedText += tmp; adjustedText += tmp;
} }
libtext->SetText( adjustedText.IsEmpty() ? wxS( "~" ) : adjustedText ); libtext->SetText( adjustedText.IsEmpty() ? wxString( wxS( "~" ) ) : adjustedText );
loadTextAttributes( libtext.get(), aText ); loadTextAttributes( libtext.get(), aText );
return libtext.release(); return libtext.release();
@ -2531,7 +2532,9 @@ SCH_TEXT* SCH_IO_EAGLE::loadPlainText( const std::unique_ptr<ETEXT>& aText )
adjustedText += tmp; adjustedText += tmp;
} }
schtext->SetText( adjustedText.IsEmpty() ? wxS( "\" \"" ) : escapeName( adjustedText ) ); schtext->SetText( adjustedText.IsEmpty() ? wxString( wxS( "\" \"" ) )
: escapeName( adjustedText ) );
schtext->SetPosition( VECTOR2I( aText->x.ToSchUnits(), -aText->y.ToSchUnits() ) ); schtext->SetPosition( VECTOR2I( aText->x.ToSchUnits(), -aText->y.ToSchUnits() ) );
loadTextAttributes( schtext.get(), aText ); loadTextAttributes( schtext.get(), aText );
schtext->SetItalic( false ); schtext->SetItalic( false );