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

6
include/wx/html/helpfrm.h
View File

@@ -74,9 +74,11 @@ public:
wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); } wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); }
wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID, wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID,
const wxString& title = wxEmptyString, 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, 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(); virtual ~wxHtmlHelpFrame();
/// Returns the data associated with the window. /// Returns the data associated with the window.

2
src/html/helpctrl.cpp
View File

@@ -155,8 +155,8 @@ wxHtmlHelpFrame* wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
{ {
wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data); wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data);
frame->SetController(this); frame->SetController(this);
frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle, m_Config, m_ConfigRoot);
frame->SetTitleFormat(m_titleFormat); frame->SetTitleFormat(m_titleFormat);
frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle);
m_helpFrame = frame; m_helpFrame = frame;
return frame; return frame;
} }

10
src/html/helpfrm.cpp
View File

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

8
wxPython/src/html.i
View File

@@ -1594,7 +1594,9 @@ public:
wxHtmlHelpFrame(wxWindow* parent, int wxWindowID, wxHtmlHelpFrame(wxWindow* parent, int wxWindowID,
const wxString& title = wxPyEmptyString, 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)); %RenameCtor(PreHtmlHelpFrame, wxHtmlHelpFrame(wxHtmlHelpData* data = NULL));
// Turn it back on again // Turn it back on again
@@ -1602,7 +1604,9 @@ public:
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxString& title = wxPyEmptyString, const wxString& title = wxPyEmptyString,
int style = wxHF_DEFAULT_STYLE); int style = wxHF_DEFAULT_STYLE,
wxConfigBase *config=NULL,
const wxString& rootpath = wxPyEmptyString);
wxHtmlHelpData* GetData(); wxHtmlHelpData* GetData();
void SetTitleFormat(const wxString& format); void SetTitleFormat(const wxString& format);