Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set wxHtmlHelpFrame title format before creating it.

Browse Source 
This ensures that it's always set before it can be used, fixing assert
introduced in r75748.

Closes #15977.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-02-17 23:53:15 +00:00
parent f20fbba01f
commit 8e828674c4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/html/helpctrl.cpp
View File

@@ -176,12 +176,12 @@ wxHtmlHelpFrame* wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
{ {
wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data); wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data);
frame->SetController(this); frame->SetController(this);
frame->SetTitleFormat(m_titleFormat);
frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle
#if wxUSE_CONFIG #if wxUSE_CONFIG
, m_Config, m_ConfigRoot , m_Config, m_ConfigRoot
#endif // wxUSE_CONFIG #endif // wxUSE_CONFIG
); );
frame->SetTitleFormat(m_titleFormat);
frame->SetShouldPreventAppExit(m_shouldPreventAppExit); frame->SetShouldPreventAppExit(m_shouldPreventAppExit);
m_helpFrame = frame; m_helpFrame = frame;
return frame; return frame;