Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-24 16:20:05 +02:00
Code Issues Releases Wiki Activity

Bug 1412 - (partial workaround for) modeless real/empty "Help on the Internet" pair.

Browse Source
This commit is contained in:
James Crook 2017-02-26 09:44:23 +00:00
parent 9cb68a66a0
commit bf7799e90c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/HelpSystem.cpp
View File

@ -101,6 +101,10 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent,
LinkingHtmlWindow *html; LinkingHtmlWindow *html;
wxASSERT(pParent); // to justify safenew wxASSERT(pParent); // to justify safenew
// JKC: ANSWER-ME: Why do we create a fake 'frame' and then put a BrowserDialog
// inside it, rather than have a variant of the BrowserDialog that is a
// frame??
// Bug 1412 seems to be related to the extra frame.
auto pFrame = safenew wxFrame { auto pFrame = safenew wxFrame {
pParent, wxID_ANY, Title, wxDefaultPosition, wxDefaultSize, pParent, wxID_ANY, Title, wxDefaultPosition, wxDefaultSize,
#if defined(__WXMAC__) #if defined(__WXMAC__)
@ -120,6 +124,8 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent,
else else
pWnd = safenew BrowserDialog{ pFrame, Title }; pWnd = safenew BrowserDialog{ pFrame, Title };
// Bug 1412 workaround for 'extra window'. Hide the 'fake' window.
pFrame->SetTransparent(0);
ShuttleGui S( pWnd, eIsCreating ); ShuttleGui S( pWnd, eIsCreating );
S.SetStyle( wxNO_BORDER | wxTAB_TRAVERSAL ); S.SetStyle( wxNO_BORDER | wxTAB_TRAVERSAL );
@ -344,9 +350,11 @@ void HelpSystem::ShowHelpDialog(wxWindow *parent,
webHelpPage.c_str(), localHelpPage.c_str()); webHelpPage.c_str(), localHelpPage.c_str());
wxASSERT(parent); // to justify safenew wxASSERT(parent); // to justify safenew
HelpSystem::ShowHelpDialog( HelpSystem::ShowHelpDialog(
parent, parent,
localHelpPage, localHelpPage,
webHelpPage, webHelpPage,
bModal); bModal
);
} }