From 2f178db70099b7237e84c014f2c885ee84768570 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 23 Jul 2017 17:32:01 -0400 Subject: [PATCH] Revert "Bug 1432 another case..." It's not safe for Windows... ... It made it possible to get into a state where some of the toolbars stopped responding. This reverts commit 67b858ed3ff1c6c84fdb1b505e6ccb882471d6f6. --- src/Project.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Project.cpp b/src/Project.cpp index 11e25a093..c9b7c4be6 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -2410,10 +2410,6 @@ 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 @@ -2445,6 +2441,7 @@ void AudacityProject::OnActivate(wxActivateEvent & event) MacShowUndockedToolbars(true); #endif } + event.Skip(); } bool AudacityProject::IsActive()