From 67b858ed3ff1c6c84fdb1b505e6ccb882471d6f6 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 23 Jul 2017 15:44:04 -0400 Subject: [PATCH] Bug 1432 another case... ...Mac, drag toolbar with the focus on or off dock, won't lose focus. You still lose focus when dragging another bar to undocked. --- src/Project.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Project.cpp b/src/Project.cpp index c9b7c4be6..11e25a093 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -2410,6 +2410,10 @@ void AudacityProject::OnActivate(wxActivateEvent & event) return; } + // Let the base class do what it wants... + wxFrame::OnActivate(event); + // ... but then we override its decisions about focus. + mActive = event.GetActive(); // Under Windows, focus can be "lost" when returning to @@ -2441,7 +2445,6 @@ void AudacityProject::OnActivate(wxActivateEvent & event) MacShowUndockedToolbars(true); #endif } - event.Skip(); } bool AudacityProject::IsActive()