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

fp editor: fix incorrect parent for a error message box 

Fixes #6773
https://gitlab.com/kicad/code/kicad/issues/6773
This commit is contained in:
jean-pierre charras 2020-12-17 10:47:39 +01:00
parent 3d68aa4b86
commit b425889a1a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pcbnew/footprint_libraries_utils.cpp
View File

@ -178,7 +178,7 @@ static FOOTPRINT* parse_footprint_kicad( const wxFileName& aFileName )
wxFFile f( aFileName.GetFullPath() ); wxFFile f( aFileName.GetFullPath() );
if( !f.IsOpened() ) if( !f.IsOpened() )
return NULL; return nullptr;
f.ReadAll( &fcontents ); f.ReadAll( &fcontents );
@ -187,7 +187,7 @@ static FOOTPRINT* parse_footprint_kicad( const wxFileName& aFileName )
/** /**
* Try to load a footprint, returning NULL if the file couldn't be accessed. * Try to load a footprint, returning nullptr if the file couldn't be accessed.
* @param aFileName - file name to load * @param aFileName - file name to load
* @param aFileType - type of the file to load * @param aFileType - type of the file to load
* @param aName - footprint name * @param aName - footprint name
@ -210,7 +210,7 @@ FOOTPRINT* try_load_footprint( const wxFileName& aFileName, IO_MGR::PCB_FILE_T a
default: default:
wxFAIL_MSG( wxT( "unexpected IO_MGR::PCB_FILE_T" ) ); wxFAIL_MSG( wxT( "unexpected IO_MGR::PCB_FILE_T" ) );
footprint = NULL; footprint = nullptr;
} }
return footprint; return footprint;
@ -233,7 +233,7 @@ FOOTPRINT* FOOTPRINT_EDIT_FRAME::ImportFootprint( const wxString& aName )
fn = getFootprintFilenameFromUser( this, lastOpenedPathForLoading ); fn = getFootprintFilenameFromUser( this, lastOpenedPathForLoading );
if( !fn.IsOk() ) if( !fn.IsOk() )
return NULL; return nullptr;
FILE* fp = wxFopen( fn.GetFullPath(), wxT( "rt" ) ); FILE* fp = wxFopen( fn.GetFullPath(), wxT( "rt" ) );
@ -241,7 +241,7 @@ FOOTPRINT* FOOTPRINT_EDIT_FRAME::ImportFootprint( const wxString& aName )
{ {
wxString msg = wxString::Format( _( "File \"%s\" not found" ), fn.GetFullPath() ); wxString msg = wxString::Format( _( "File \"%s\" not found" ), fn.GetFullPath() );
DisplayError( this, msg ); DisplayError( this, msg );
return NULL; return nullptr;
} }
cfg->m_LastImportExportPath = lastOpenedPathForLoading; cfg->m_LastImportExportPath = lastOpenedPathForLoading;
@ -252,10 +252,10 @@ FOOTPRINT* FOOTPRINT_EDIT_FRAME::ImportFootprint( const wxString& aName )
if( fileType == IO_MGR::FILE_TYPE_NONE ) if( fileType == IO_MGR::FILE_TYPE_NONE )
{ {
DisplayError( this, _( "Not a footprint file" ) ); DisplayError( this, _( "Not a footprint file" ) );
return NULL; return nullptr;
} }
FOOTPRINT* footprint = NULL; FOOTPRINT* footprint = nullptr;
try try
{ {
@ -267,7 +267,7 @@ FOOTPRINT* FOOTPRINT_EDIT_FRAME::ImportFootprint( const wxString& aName )
footprintName, footprintName,
fn.GetFullPath() ); fn.GetFullPath() );
DisplayError( this, msg ); DisplayError( this, msg );
return NULL; return nullptr;
} }
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
@ -280,7 +280,7 @@ FOOTPRINT* FOOTPRINT_EDIT_FRAME::ImportFootprint( const wxString& aName )
// reading the selected file // reading the selected file
if( !footprint ) if( !footprint )
return NULL; return nullptr;
} }
footprint->SetFPID( LIB_ID( wxEmptyString, footprintName ) ); footprint->SetFPID( LIB_ID( wxEmptyString, footprintName ) );
@ -347,7 +347,7 @@ void FOOTPRINT_EDIT_FRAME::ExportFootprint( FOOTPRINT* aFootprint )
FILE* fp = wxFopen( dlg.GetPath(), wxT( "wt" ) ); FILE* fp = wxFopen( dlg.GetPath(), wxT( "wt" ) );
if( fp == NULL ) if( fp == nullptr )
{ {
wxMessageBox( wxString::Format( _( "Unable to create or write file \"%s\"" ), wxMessageBox( wxString::Format( _( "Unable to create or write file \"%s\"" ),
dlg.GetPath() ) ); dlg.GetPath() ) );
@ -607,7 +607,7 @@ bool FOOTPRINT_EDIT_FRAME::DeleteFootprintFromLibrary( const LIB_ID& aFPID, bool
void PCB_EDIT_FRAME::ExportFootprintsToLibrary( bool aStoreInNewLib, const wxString& aLibName, void PCB_EDIT_FRAME::ExportFootprintsToLibrary( bool aStoreInNewLib, const wxString& aLibName,
wxString* aLibPath ) wxString* aLibPath )
{ {
if( GetBoard()->GetFirstFootprint() == NULL ) if( GetBoard()->GetFirstFootprint() == nullptr )
{ {
DisplayInfoMessage( this, _( "No footprints to export!" ) ); DisplayInfoMessage( this, _( "No footprints to export!" ) );
return; return;
@ -783,14 +783,14 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintToBoard( bool aAddNew )
// not just add it to the board with total disregard for the netlist... // not just add it to the board with total disregard for the netlist...
PCB_EDIT_FRAME* pcbframe = (PCB_EDIT_FRAME*) Kiway().Player( FRAME_PCB_EDITOR, false ); PCB_EDIT_FRAME* pcbframe = (PCB_EDIT_FRAME*) Kiway().Player( FRAME_PCB_EDITOR, false );
if( pcbframe == NULL ) // happens when the board editor is not active (or closed) if( pcbframe == nullptr ) // happens when the board editor is not active (or closed)
{ {
ShowInfoBarError( _( "No board currently open." ) ); ShowInfoBarError( _( "No board currently open." ) );
return false; return false;
} }
BOARD* mainpcb = pcbframe->GetBoard(); BOARD* mainpcb = pcbframe->GetBoard();
FOOTPRINT* sourceFootprint = NULL; FOOTPRINT* sourceFootprint = nullptr;
FOOTPRINT* editorFootprint = GetBoard()->GetFirstFootprint(); FOOTPRINT* editorFootprint = GetBoard()->GetFirstFootprint();
// Search the old footprint (source) if exists // Search the old footprint (source) if exists
@ -809,7 +809,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintToBoard( bool aAddNew )
} }
} }
if( !aAddNew && sourceFootprint == NULL ) // source not found if( !aAddNew && sourceFootprint == nullptr ) // source not found
{ {
DisplayError( this, _( "Unable to find the footprint on the main board.\nCannot save." ) ); DisplayError( this, _( "Unable to find the footprint on the main board.\nCannot save." ) );
return false; return false;
@ -860,7 +860,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintToBoard( bool aAddNew )
bool FOOTPRINT_EDIT_FRAME::SaveFootprintAs( FOOTPRINT* aFootprint ) bool FOOTPRINT_EDIT_FRAME::SaveFootprintAs( FOOTPRINT* aFootprint )
{ {
if( aFootprint == NULL ) if( aFootprint == nullptr )
return false; return false;
FP_LIB_TABLE* tbl = Prj().PcbFootprintLibs(); FP_LIB_TABLE* tbl = Prj().PcbFootprintLibs();
@ -923,7 +923,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintAs( FOOTPRINT* aFootprint )
if( libraryName.IsEmpty() ) if( libraryName.IsEmpty() )
{ {
DisplayError( NULL, _( "No library specified. Footprint could not be saved." ) ); DisplayError( this, _( "No library specified. Footprint could not be saved." ) );
return false; return false;
} }
@ -933,7 +933,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintAs( FOOTPRINT* aFootprint )
if( footprintName.IsEmpty() ) if( footprintName.IsEmpty() )
{ {
DisplayError( NULL, _( "No footprint name specified. Footprint could not be saved." ) ); DisplayError( this, _( "No footprint name specified. Footprint could not be saved." ) );
return false; return false;
} }
@ -1027,7 +1027,7 @@ FOOTPRINT* PCB_BASE_FRAME::CreateNewFootprint( const wxString& aFootprintName )
dlg.SetTextValidator( FOOTPRINT_NAME_VALIDATOR( &footprintName ) ); dlg.SetTextValidator( FOOTPRINT_NAME_VALIDATOR( &footprintName ) );
if( dlg.ShowModal() != wxID_OK ) if( dlg.ShowModal() != wxID_OK )
return NULL; //Aborted by user return nullptr; //Aborted by user
} }
footprintName.Trim( true ); footprintName.Trim( true );
@ -1036,7 +1036,7 @@ FOOTPRINT* PCB_BASE_FRAME::CreateNewFootprint( const wxString& aFootprintName )
if( footprintName.IsEmpty() ) if( footprintName.IsEmpty() )
{ {
DisplayInfoMessage( this, _( "No footprint name defined." ) ); DisplayInfoMessage( this, _( "No footprint name defined." ) );
return NULL; return nullptr;
} }
// Creates the new footprint and add it to the head of the linked list of footprints // Creates the new footprint and add it to the head of the linked list of footprints