From 839bb0a6dbd4d5038cc2e3e5e58740bddbf2e7ee Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 21 Jun 2016 11:54:21 -0400 Subject: [PATCH] Help dialogs are modal only when necessary --- src/TimerRecordDialog.cpp | 2 +- src/widgets/HelpSystem.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 0b7582866..4a1564e8b 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -348,7 +348,7 @@ void TimerRecordDialog::OnAutoExportCheckBox_Change(wxCommandEvent& WXUNUSED(eve void TimerRecordDialog::OnHelpButtonClick(wxCommandEvent& WXUNUSED(event)) { - HelpSystem::ShowHelpDialog(this, wxT("Timer_Record")); + HelpSystem::ShowHelpDialog(this, wxT("Timer_Record"), true); } wxString TimerRecordDialog::GetHoursMinsString(int iMinutes) { diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index 54dc179c8..bb1d0c3b4 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -177,8 +177,10 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent, pFrame->SetSizeHints(pWnd->GetSize()); pFrame->SetName(Title); - pFrame->Show( true ); - pWnd->ShowModal(); + if (bModal) + pWnd->ShowModal(); + else + pWnd->Show(true); html->SetRelatedStatusBar( 0 ); html->SetFocus();