From 7808064ae10fbc99bba0ba4c30807e3a0ba69ae2 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 21 Jun 2016 13:11:35 -0400
Subject: [PATCH] Bug1409: Mac: Restore focus to Contrast after dismissing help
 window

---
 src/widgets/HelpSystem.cpp        | 4 +++-
 src/widgets/LinkingHtmlWindow.cpp | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp
index bb1d0c3b4..750f20170 100644
--- a/src/widgets/HelpSystem.cpp
+++ b/src/widgets/HelpSystem.cpp
@@ -179,8 +179,10 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent,
    pFrame->SetName(Title);
    if (bModal)
       pWnd->ShowModal();
-   else
+   else {
       pWnd->Show(true);
+      pFrame->Show(true);
+   }
 
    html->SetRelatedStatusBar( 0 );
    html->SetFocus();
diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp
index 0fe059498..c4d8342f9 100644
--- a/src/widgets/LinkingHtmlWindow.cpp
+++ b/src/widgets/LinkingHtmlWindow.cpp
@@ -57,7 +57,9 @@ void BrowserDialog::OnBackward(wxCommandEvent & WXUNUSED(event))
 void BrowserDialog::OnClose(wxCommandEvent & WXUNUSED(event))
 {
    EndModal(wxID_CANCEL);
+#ifndef __WXMAC__
    GetParent()->Destroy();
+#endif
 }
 
 void BrowserDialog::OnKeyDown(wxKeyEvent & event)