Browse Source

Fix assertion when exporting hotkeys. (fixes lp:1479859)

* wxFD_SAVE and wxFD_OPEN cannot be specified when calling wxFileDialog.  it even says so in
  the documentation.
pull/6/head
Wayne Stambaugh 10 years ago
parent
commit
0cff6444e0
  1. 8
      common/hotkeys_basic.cpp

8
common/hotkeys_basic.cpp

@ -50,7 +50,7 @@
wxString g_CommonSectionTag( wxT( "[common]" ) );
/* Class to handle hotkey commnands. hotkeys have a default value
/* Class to handle hotkey commands hotkeys have a default value
* This class allows the real key code changed by user from a key code list
* file.
*/
@ -279,7 +279,7 @@ wxString AddHotkeyName( const wxString& aText, EDA_HOTKEY** aList,
}
#ifdef USING_MAC_CMD
// On OSX, the modifier euqivalent to the Ctrl key of PCs
// On OSX, the modifier equivalent to the Ctrl key of PCs
// is the Cmd key, but in code we should use Ctrl as prefix in menus
msg.Replace( MODIFIER_CMD_MAC, MODIFIER_CTRL_BASE );
#endif
@ -337,7 +337,7 @@ wxString AddHotkeyName( const wxString& aText,
}
#ifdef USING_MAC_CMD
// On OSX, the modifier euqivalent to the Ctrl key of PCs
// On OSX, the modifier equivalent to the Ctrl key of PCs
// is the Cmd key, but in code we should use Ctrl as prefix in menus
msg.Replace( MODIFIER_CMD_MAC, MODIFIER_CTRL_BASE );
#endif
@ -794,7 +794,7 @@ void EDA_BASE_FRAME::ExportHotkeyConfigToFile( EDA_HOTKEY_CONFIG* aDescList,
ext,
mask,
this,
wxFD_OPEN | wxFD_SAVE,
wxFD_SAVE,
true );
if( filename.IsEmpty() )

Loading…
Cancel
Save