Do not use the deprecated wxWidgets wxPATH_NORM_ALL flag.

Replaced by our equivalent FN_NORMALIZE_FLAGS flag.
Fix also a typo in a string.
This commit is contained in:
jean-pierre charras 2023-08-28 11:28:55 +02:00
parent 10ed1d1a7f
commit f4bf3bf611
2 changed files with 4 additions and 2 deletions

View File

@ -35,6 +35,7 @@
#include <schematic.h>
#include <sch_plugins/kicad/sch_sexpr_plugin.h>
#include <wildcards_and_files_ext.h>
#include <wx_filename.h>
const wxString CADSTAR_SCH_ARCHIVE_PLUGIN::GetName() const
@ -267,7 +268,8 @@ void CADSTAR_SCH_ARCHIVE_PLUGIN::ensureLoadedLibrary( const wxString& aLibraryPa
wxFileName libDir( aLibraryPath );
libDir.ClearExt();
libDir.SetName( "" );
csafn.Normalize( wxPATH_NORM_ALL, libDir.GetAbsolutePath() );
// wxPATH_NORM_ALL is deprecated in wxWidgets 3.1, so use our flags
csafn.Normalize( FN_NORMALIZE_FLAGS, libDir.GetAbsolutePath() );
}
}
else

View File

@ -1066,7 +1066,7 @@ bool FOOTPRINT_VIEWER_FRAME::ShowModal( wxString* aFootprint, wxWindow* aParent
if( WX_INFOBAR* infobar = GetInfoBar() )
{
button = new wxHyperlinkCtrl( infobar, wxID_ANY,
_( "Manage symol libraries" ),
_( "Manage symbol libraries" ),
wxEmptyString );
button->Bind( wxEVT_COMMAND_HYPERLINK, std::function<void( wxHyperlinkEvent & aEvent )>(
[=]( wxHyperlinkEvent& aEvent )