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

Pass the config object into the wxHtmlHelpFrame so it has the config

Browse Source 
info in time to set the position and size of the frame.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-24 01:16:18 +00:00
parent 7f44209657
commit 18fc605924
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/html/helpfrm.cpp
View File

@@ -69,10 +69,11 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
END_EVENT_TABLE()
wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
int style, wxHtmlHelpData* data)
int style, wxHtmlHelpData* data,
wxConfigBase *config, const wxString& rootpath)
{
Init(data);
Create(parent, id, title, style);
Create(parent, id, title, style, config, rootpath);
}
void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
@@ -85,10 +86,13 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
// Create: builds the GUI components.
bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
const wxString& WXUNUSED(title), int style)
const wxString& WXUNUSED(title), int style,
wxConfigBase *config, const wxString& rootpath)
{
m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
if ( config)
m_HtmlHelpWin->UseConfig(config, rootpath);
wxFrame::Create(parent, id, _("Help"),
wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),