From 73b7d4dba31821968028430ee4f59009da77dff7 Mon Sep 17 00:00:00 2001 From: "james.k.crook" Date: Thu, 10 Feb 2011 21:16:14 +0000 Subject: [PATCH] Patch to fix menu hot-key conflicts on mac, fixing bug 88, (adapted from patch by Gale) --- src/Menus.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Menus.cpp b/src/Menus.cpp index 2f305e0bb..c0b713246 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -749,7 +749,12 @@ void AudacityProject::CreateMenusAndCommands() c->AddItem(wxT("AddLabel"), _("Add Label At &Selection"), FN(OnAddLabel), wxT("Ctrl+B"), AlwaysEnabledFlag, AlwaysEnabledFlag); c->AddItem(wxT("AddLabelPlaying"), _("Add Label At &Playback Position"), - FN(OnAddLabelPlaying), wxT("Ctrl+M"), + FN(OnAddLabelPlaying), +#ifdef __WXMAC__ + wxT("Ctrl+."), +#else + wxT("Ctrl+M"), +#endif 0, AudioIONotBusyFlag); c->AddItem(wxT("EditLabels"), _("&Edit Labels"), FN(OnEditLabels)); @@ -1127,7 +1132,12 @@ void AudacityProject::CreateMenusAndCommands() c->SetDefaultFlags(AlwaysEnabledFlag, AlwaysEnabledFlag); - c->AddCommand(wxT("FullScreenOnOff"), _("Full screen on/off"), FN(OnFullScreen), wxT("F11")); + c->AddCommand(wxT("FullScreenOnOff"), _("Full screen on/off"), FN(OnFullScreen), +#ifdef __WXMAC__ + wxT("Ctrl+/")); +#else + wxT("F11")); +#endif c->AddCommand(wxT("InputDevice"), _("Change input device"), FN(OnInputDevice), wxT("Shift+I"), AudioIONotBusyFlag,