From 3b54a44540030b64fcfd9fb49a95e40d87d96df4 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Sat, 5 Jan 2019 20:23:13 -0800 Subject: [PATCH] wildcard strings update Replace a few other cases where we used Windows-only or *nix specific wildcard strings --- 3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp | 4 ++-- eeschema/dialogs/dialog_bom.cpp | 5 +++-- eeschema/dialogs/dialog_netlist.cpp | 5 ++--- kicad/files-io.cpp | 2 +- pcbnew/microwave.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp index 213c4236d1..a1372c0543 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp @@ -111,7 +111,7 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana if( !filter.empty() ) m_FileTree->SetFilter( filter ); else - m_FileTree->SetFilter( wxT( "*.*" ) ); + m_FileTree->SetFilter( wxFileSelectorDefaultWildcardStr ); if( prevModelWildcard >= 0 && prevModelWildcard < (int)fl->size() ) m_FileTree->SetFilterIndex( prevModelWildcard ); @@ -123,7 +123,7 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana } else { - m_FileTree->SetFilter( wxT( "*.*" ) ); + m_FileTree->SetFilter( wxFileSelectorDefaultWildcardStr ); prevModelWildcard = 0; m_FileTree->SetFilterIndex( 0 ); } diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp index 3f23db8167..cd5cc42f76 100644 --- a/eeschema/dialogs/dialog_bom.cpp +++ b/eeschema/dialogs/dialog_bom.cpp @@ -354,7 +354,7 @@ void DIALOG_BOM::installPluginsList() pluginPath.AssignDir( dir.GetName() ); wxString fileName; - bool cont = dir.GetFirst( &fileName, "*", wxDIR_FILES ); + bool cont = dir.GetFirst( &fileName, wxFileSelectorDefaultWildcardStr, wxDIR_FILES ); while( cont ) { @@ -546,7 +546,8 @@ wxString DIALOG_BOM::choosePlugin() } wxString fullFileName = EDA_FILE_SELECTOR( _( "Plugin files:" ), lastPath, wxEmptyString, - wxEmptyString, "*", this, wxFD_OPEN, true ); + wxEmptyString, wxFileSelectorDefaultWildcardStr, + this, wxFD_OPEN, true ); return fullFileName; } diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp index c5425006cb..4287e0d0d3 100644 --- a/eeschema/dialogs/dialog_netlist.cpp +++ b/eeschema/dialogs/dialog_netlist.cpp @@ -834,9 +834,8 @@ void NETLIST_DIALOG_ADD_PLUGIN::OnOKClick( wxCommandEvent& event ) void NETLIST_DIALOG_ADD_PLUGIN::OnBrowsePlugins( wxCommandEvent& event ) { - wxString FullFileName, Mask, Path; + wxString FullFileName, Path; - Mask = wxT( "*" ); #ifndef __WXMAC__ Path = Pgm().GetExecutablePath(); #else @@ -846,7 +845,7 @@ void NETLIST_DIALOG_ADD_PLUGIN::OnBrowsePlugins( wxCommandEvent& event ) Path, FullFileName, wxEmptyString, - Mask, + wxFileSelectorDefaultWildcardStr, this, wxFD_OPEN, true diff --git a/kicad/files-io.cpp b/kicad/files-io.cpp index 126ec0302c..104abfd640 100644 --- a/kicad/files-io.cpp +++ b/kicad/files-io.cpp @@ -86,7 +86,7 @@ void KICAD_MANAGER_FRAME::OnUnarchiveFiles( wxCommandEvent& event ) zipfilesys.ChangePathTo( zipfiledlg.GetPath() + wxT( "#zip:" ), true ); wxFSFile* zipfile = NULL; - wxString localfilename = zipfilesys.FindFirst( wxT( "*.*" ) ); + wxString localfilename = zipfilesys.FindFirst( wxFileSelectorDefaultWildcardStr ); while( !localfilename.IsEmpty() ) { diff --git a/pcbnew/microwave.cpp b/pcbnew/microwave.cpp index 94c475c19c..c901be860a 100644 --- a/pcbnew/microwave.cpp +++ b/pcbnew/microwave.cpp @@ -497,7 +497,7 @@ void MWAVE_POLYGONAL_SHAPE_DLG::OnOkClick( wxCommandEvent& event ) void MWAVE_POLYGONAL_SHAPE_DLG::ReadDataShapeDescr( wxCommandEvent& event ) { static wxString lastpath; // To remember the last open path during a session - wxString mask = wxT( "*.*" ); + wxString mask = wxFileSelectorDefaultWildcardStr; wxString FullFileName = EDA_FILE_SELECTOR( _( "Read descr shape file" ), lastpath, FullFileName,