AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

Fix conflict with windows header define thats leaking in

Browse Source 
GetTempFileName is a windows header define unforunately and the big boi header is leaking in somehow
This commit is contained in:
Marek Roszko 2024-07-15 20:22:33 -04:00
parent 3097798a95
commit c16d078b8c
5 changed files with 7 additions and 7 deletions

2
common/dialogs/dialog_page_settings.cpp
View File

@ -822,7 +822,7 @@ void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxCommandEvent& event )
fn.Assign( fileName );
EMBEDDED_FILES::EMBEDDED_FILE* result = m_embeddedFiles->AddFile( fn, false );
shortFileName = result->GetLink();
fileName = m_embeddedFiles->GetTempFileName( result->name ).GetFullPath();
fileName = m_embeddedFiles->GetTemporaryFileName( result->name ).GetFullPath();
}
else if( !m_projectPath.IsEmpty() && fileName.StartsWith( m_projectPath ) )
{

2
common/eda_doc.cpp
View File

@ -103,7 +103,7 @@ bool GetAssociatedDocument( wxWindow* aParent, const wxString& aDocName, PROJECT
docname = docname.Mid( 14 );
wxFileName temp_file = aFiles->GetTempFileName( docname );
wxFileName temp_file = aFiles->GetTemporaryFileName( docname );
if( !temp_file.IsOk() )
{

4
common/embedded_files.cpp
View File

@ -446,7 +446,7 @@ void EMBEDDED_FILES_PARSER::ParseEmbedded( EMBEDDED_FILES* aFiles )
}
wxFileName EMBEDDED_FILES::GetTempFileName( const wxString& aName ) const
wxFileName EMBEDDED_FILES::GetTemporaryFileName( const wxString& aName ) const
{
wxFileName cacheFile;
@ -504,7 +504,7 @@ const std::vector<wxString>* EMBEDDED_FILES::UpdateFontFiles()
for( const auto& [name, entry] : m_files )
{
if( entry->type == EMBEDDED_FILE::FILE_TYPE::FONT )
m_fontFiles.push_back( GetTempFileName( name ).GetFullPath() );
m_fontFiles.push_back( GetTemporaryFileName( name ).GetFullPath() );
}
return &m_fontFiles;

2
common/filename_resolver.cpp
View File

@ -274,7 +274,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName, const wxStri
}
wxString path = tname.Mid( 14 );
wxFileName temp_file = aFiles->GetTempFileName( path );
wxFileName temp_file = aFiles->GetTemporaryFileName( path );
if( !temp_file.IsOk() )
{

4
include/embedded_files.h
View File

@ -189,9 +189,9 @@ public:
return m_files;
}
wxFileName GetTempFileName( const wxString& aName ) const;
wxFileName GetTemporaryFileName( const wxString& aName ) const;
wxFileName GetTempFileName( EMBEDDED_FILE* aFile ) const;
wxFileName GetTemporaryFileName( EMBEDDED_FILE* aFile ) const;
void ClearEmbeddedFiles( bool aDeleteFiles = true )
{