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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index f543ee41a8ca0b416ba7ada7833a7a73dc3e34cd..cc50b5fc577ecf6fdf0401e34cf948e6dd3cd543 100644 (file)
--- 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,
     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,
     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.
     virtual ~wxHtmlHelpFrame();
 
     /// Returns the data associated with the window.

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index bc026182ee947ce4c2094b9ce303a3929b060e7b..a0c120aa75574e7d54c71508740e274e3887515a 100644 (file)
--- 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);
 {
     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->SetTitleFormat(m_titleFormat);    

-    frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle);

     m_helpFrame = frame;
     return frame;
 }
     m_helpFrame = frame;
     return frame;
 }

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 511c1dc044f9c0fba409fecd3037285bc4475a29..c3a082efb9945f366156daa03acc3c514bfec1f5 100644 (file)
--- 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,
 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);
 {
     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,10 +86,13 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
 
 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
 // 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);
 {
     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),
     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 b9ee8454bec87ec414b3be898205310cf4af7ca2..dbb187082060e915fa1fb0c9fe5b4e8fe87b8e62 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -1594,7 +1594,9 @@ public:
 
     wxHtmlHelpFrame(wxWindow* parent, int wxWindowID,
                    const wxString& title = wxPyEmptyString,
 
     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
     %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,
 
     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);
 
     wxHtmlHelpData* GetData();
     void SetTitleFormat(const wxString& format);