From 9d506cd850fe371d737b96cd9d84a4921150d1d1 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 22 Jun 2016 13:42:03 -0400 Subject: [PATCH] Bug1409 again: Dismiss Mac help window, be sure parent regains focus --- src/widgets/LinkingHtmlWindow.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp index c4d8342f9..b5b51fd7f 100644 --- a/src/widgets/LinkingHtmlWindow.cpp +++ b/src/widgets/LinkingHtmlWindow.cpp @@ -57,8 +57,18 @@ void BrowserDialog::OnBackward(wxCommandEvent & WXUNUSED(event)) void BrowserDialog::OnClose(wxCommandEvent & WXUNUSED(event)) { EndModal(wxID_CANCEL); -#ifndef __WXMAC__ - GetParent()->Destroy(); + auto parent = GetParent(); + +#ifdef __WXMAC__ + auto grandparent = GetParent()->GetParent(); +#endif + + parent->Destroy(); + +#ifdef __WXMAC__ + if(grandparent && grandparent->IsShown()) { + grandparent->Raise(); + } #endif }