From 2e8ee5fe75789d60869b19fe1986c8d47cf0b995 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 28 Sep 2016 11:54:17 -0400
Subject: [PATCH] Bugs 868, 1196 again: Fix alt-f6 cycle but not changing
 button focus

Mac and Linux problem only.

See commits 58e3f3da839694ea8da6db4aa5dce8a439a1484d
and a00f866b5425572dbb8032d93ad2627fa07e1d08
---
 src/AudacityApp.cpp | 1 -
 src/Menus.cpp       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index c0311fb84..282afd372 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -1142,7 +1142,6 @@ int AudacityApp::FilterEvent(wxEvent & event)
       {
          const auto window = ((wxWindow *)e.GetEventObject());
          window->SetFocus();
-         window->NavigateIn();
       }
    }
 #endif
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 96d5cbe38..8a610be61 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -2932,7 +2932,7 @@ void AudacityProject::NextWindow()
    // navigation among top level windows stops because the keystrokes don't
    // go to the CommandManager.
    if (dynamic_cast<wxDialog*>(w)) {
-      w->NavigateIn();
+      w->SetFocus();
    }
 #endif
 }
@@ -2984,7 +2984,7 @@ void AudacityProject::PrevWindow()
    // navigation among top level windows stops because the keystrokes don't
    // go to the CommandManager.
    if (dynamic_cast<wxDialog*>(w)) {
-      w->NavigateIn();
+      w->SetFocus();
    }
 #endif
 }