1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-05 14:18:53 +02:00

Bug 1641 - Don't use the 'space trick' on Linux/Mac menus.

The 'added space trick' to disable menu accelerators and still show them hides the accelerators completely on Linux/Mac.  Linux/Mac rejects the invalid accelerators.  Fortunately we don't need to disable the menu accelerators on Linux/Mac.  These menu accelerators causing a problem (in bug 1637) only happens on Windows.  So the 'space trick' is now used only on Windows.
This commit is contained in:
James Crook 2017-05-09 08:22:36 +01:00
parent 5b36f5d6a9
commit 94c43773fc

View File

@ -981,6 +981,7 @@ wxString CommandManager::GetLabelWithDisabledAccel(const CommandListEntry *entry
{
// Dummy accelerator that looks Ok in menus but is non functional.
// Note the space before the key.
#ifdef __WXMSW__
Accel = wxString("\t ") + entry->key;
if( entry->key.StartsWith("Left" )) break;
if( entry->key.StartsWith("Right")) break;
@ -1006,6 +1007,7 @@ wxString CommandManager::GetLabelWithDisabledAccel(const CommandListEntry *entry
if( entry->key.StartsWith("NUMPAD_ENTER" )) break;
if( entry->key.StartsWith("Backspace" )) break;
if( entry->key.StartsWith("Delete" )) break;
#endif
//wxLogDebug("Added Accel:[%s][%s]", entry->label, entry->key );
// Normal accelerator.
Accel = wxString("\t") + entry->key;