Fix debug assertion when clicking on hot key menu. (fixes lp:1389932)

5c3cc11e · Garth Corral · Wayne Stambaugh · 5f6f59ef · 5c3cc11e · 5c3cc11e
Commit 5c3cc11e authored Nov 06, 2014 by Garth Corral Committed by Wayne Stambaugh Nov 06, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

hotkeys_basic.cpp common/hotkeys_basic.cpp +1 -1

id.h include/id.h +0 -1

No files found.
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -770,7 +770,7 @@ void AddHotkeyConfigMenu( wxMenu* aMenu )

    // Append HotkeySubmenu to menu
    AddMenuItem( aMenu, HotkeySubmenu,
-                 ID_PREFERENCES_HOTKEY_SUBMENU, _( "&Hotkeys" ),
+                 wxID_ANY, _( "&Hotkeys" ),
                 _( "Hotkeys configuration and preferences" ),
                 KiBitmap( hotkeys_xpm ) );
 }
--- a/include/id.h
+++ b/include/id.h
@@ -85,7 +85,6 @@ enum main_id
    ID_CONFIG_READ,

    ID_PREFERENCES_HOTKEY_START,
-    ID_PREFERENCES_HOTKEY_SUBMENU,
    ID_PREFERENCES_HOTKEY_EXPORT_CONFIG,
    ID_PREFERENCES_HOTKEY_IMPORT_CONFIG,
    ID_PREFERENCES_HOTKEY_SHOW_EDITOR,