From 18fc605924327cb4e9b3beb994c607cf28a08560 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 24 Oct 2006 01:16:18 +0000 Subject: [PATCH] Pass the config object into the wxHtmlHelpFrame so it has the config 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 --- include/wx/html/helpfrm.h | 6 ++++-- src/html/helpctrl.cpp | 2 +- src/html/helpfrm.cpp | 12 ++++++++---- wxPython/src/html.i | 8 ++++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index f543ee41a8..cc50b5fc57 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -74,9 +74,11 @@ public: wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); } wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL); + int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL, + wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString); bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE); + int style = wxHF_DEFAULT_STYLE, + wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString); virtual ~wxHtmlHelpFrame(); /// Returns the data associated with the window. diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp index bc026182ee..a0c120aa75 100644 --- a/src/html/helpctrl.cpp +++ b/src/html/helpctrl.cpp @@ -155,8 +155,8 @@ wxHtmlHelpFrame* wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data) { wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data); frame->SetController(this); + frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle, m_Config, m_ConfigRoot); frame->SetTitleFormat(m_titleFormat); - frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle); m_helpFrame = frame; return frame; } diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 511c1dc044..c3a082efb9 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -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), diff --git a/wxPython/src/html.i b/wxPython/src/html.i index b9ee8454be..dbb1870820 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -1594,7 +1594,9 @@ public: wxHtmlHelpFrame(wxWindow* parent, int wxWindowID, const wxString& title = wxPyEmptyString, - int style = wxHF_DEFAULTSTYLE, wxHtmlHelpData* data = NULL); + int style = wxHF_DEFAULTSTYLE, wxHtmlHelpData* data = NULL, + wxConfigBase *config=NULL, + const wxString& rootpath = wxPyEmptyString); %RenameCtor(PreHtmlHelpFrame, wxHtmlHelpFrame(wxHtmlHelpData* data = NULL)); // Turn it back on again @@ -1602,7 +1604,9 @@ public: bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxPyEmptyString, - int style = wxHF_DEFAULT_STYLE); + int style = wxHF_DEFAULT_STYLE, + wxConfigBase *config=NULL, + const wxString& rootpath = wxPyEmptyString); wxHtmlHelpData* GetData(); void SetTitleFormat(const wxString& format); -- 2.45.2