From bd670df287b041f4bfa8e569ad5aa94b7b347021 Mon Sep 17 00:00:00 2001 From: "james.k.crook@gmail.com" Date: Tue, 19 Jun 2012 13:16:22 +0000 Subject: [PATCH] Actually check in the change to fix Bug 517 (intended in r11795). Added comment for code fixing Bug 523. --- src/commands/CommandManager.cpp | 3 ++- src/prefs/KeyConfigPrefs.cpp | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index fa44278f2..488e7d77e 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -665,9 +665,10 @@ int CommandManager::NewIdentifier(wxString name, wxString label, wxMenu *menu, #endif tmpEntry->defaultKey = tmpEntry->key; + // For key bindings for commands with a list, such as effects, + // the name in prefs is the category name plus the effect name. if( multi ) name= wxString::Format( wxT("%s:%s"), name.c_str(), label.c_str() ); - // + ":" + label;//wxString::Format(wxT("%d"),index ); tmpEntry->name = name; tmpEntry->label = label; diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 0aeaf53fc..048507658 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -222,12 +222,7 @@ void KeyConfigPrefs::RepopulateBindingsList() Labels, Categories, // True to include effects (list items), false otherwise. -// Hotkeys for effects not yet supported on Linux/Mac. -#ifdef __WXMSW__ true -#else - false -#endif ); bool save = (mKeys.GetCount() == 0);