mirror of
https://github.com/cookiengineer/audacity
synced 2025-12-11 15:16:27 +01:00
Fixes for bugs 1122 and 1113
Several other issues were also fixed (hopefully ;-)). This is a major change to accelerator handling and keyboard capturing. Menu shortcuts, non-menu commands, label editing, navigation, and basically anything else were you might use the keyboard should be thoroughly tested.
This commit is contained in:
@@ -62,11 +62,8 @@ wxString KeyEventToKeyString(const wxKeyEvent & event)
|
||||
long key = event.GetKeyCode();
|
||||
|
||||
if (event.ControlDown())
|
||||
#if defined(__WXMAC__)
|
||||
newStr += wxT("XCtrl+");
|
||||
#else
|
||||
newStr += wxT("Ctrl+");
|
||||
#endif
|
||||
|
||||
if (event.AltDown())
|
||||
newStr += wxT("Alt+");
|
||||
|
||||
@@ -74,11 +71,11 @@ wxString KeyEventToKeyString(const wxKeyEvent & event)
|
||||
newStr += wxT("Shift+");
|
||||
|
||||
#if defined(__WXMAC__)
|
||||
if (event.MetaDown())
|
||||
newStr += wxT("Ctrl+");
|
||||
if (event.RawControlDown())
|
||||
newStr += wxT("XCtrl+");
|
||||
#endif
|
||||
|
||||
if (event.ControlDown() && key >= 1 && key <= 26)
|
||||
if (event.RawControlDown() && key >= 1 && key <= 26)
|
||||
newStr += (wxChar)(64 + key);
|
||||
else if (key >= 33 && key <= 126)
|
||||
newStr += (wxChar)key;
|
||||
|
||||
Reference in New Issue
Block a user