Expunge EDA_FILE_SELECTOR.
EDA_FILE_SELECTOR was just an obfuscation of wxFileSelector().
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
||||
* Copyright (C) 2010 Wayne Stambaugh <[email protected]>
|
||||
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
|
||||
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <kicad_string.h>
|
||||
#include <eda_base_frame.h>
|
||||
#include <eda_draw_frame.h>
|
||||
#include <wildcards_and_files_ext.h>
|
||||
#include <settings/settings_manager.h>
|
||||
|
||||
#include <tool/tool_manager.h>
|
||||
@@ -50,6 +51,7 @@ struct hotkey_name_descr
|
||||
int m_KeyCode;
|
||||
};
|
||||
|
||||
|
||||
/* table giving the hotkey name from the hotkey code, for special keys
|
||||
* Note : when modifiers (ATL, SHIFT, CTRL) do not modify
|
||||
* the code of the key, do need to enter the modified key code
|
||||
@@ -120,6 +122,7 @@ static struct hotkey_name_descr hotkeyNameList[] =
|
||||
{ wxT( "" ), KEY_NON_FOUND }
|
||||
};
|
||||
|
||||
|
||||
// name of modifier keys.
|
||||
// Note: the Ctrl key is Cmd key on Mac OS X.
|
||||
// However, in wxWidgets defs, the key WXK_CONTROL is the Cmd key,
|
||||
@@ -326,7 +329,7 @@ void ReadHotKeyConfig( const wxString& aFileName, std::map<std::string, int>& aH
|
||||
if( fileName.IsEmpty() )
|
||||
{
|
||||
wxFileName fn( "user" );
|
||||
fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
|
||||
fn.SetExt( HotkeyFileExtension );
|
||||
fn.SetPath( SETTINGS_MANAGER::GetUserSettingsPath() );
|
||||
fileName = fn.GetFullPath();
|
||||
}
|
||||
@@ -362,7 +365,7 @@ int WriteHotKeyConfig( const std::map<std::string, TOOL_ACTION*>& aActionMap )
|
||||
std::map<std::string, int> hotkeys;
|
||||
wxFileName fn( "user" );
|
||||
|
||||
fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
|
||||
fn.SetExt( HotkeyFileExtension );
|
||||
fn.SetPath( SETTINGS_MANAGER::GetUserSettingsPath() );
|
||||
|
||||
// Read the existing config (all hotkeys)
|
||||
@@ -408,7 +411,7 @@ int ReadLegacyHotkeyConfigFile( const wxString& aFilename, std::map<std::string,
|
||||
{
|
||||
wxFileName fn( aFilename );
|
||||
|
||||
fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
|
||||
fn.SetExt( HotkeyFileExtension );
|
||||
fn.SetPath( SETTINGS_MANAGER::GetUserSettingsPath() );
|
||||
|
||||
if( !wxFile::Exists( fn.GetFullPath() ) )
|
||||
|
||||
Reference in New Issue
Block a user