added align=justify support ; also removed relic: GetMaxLineWidth

[wxWidgets.git] / include / wx / html / helpctrl.h

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 30dcac00de22d9d4d19a5ae4d885353678635d76..85511c87259c077b3ad67cf8f490a84241ff3bbd 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -51,13 +51,14 @@ class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler
         }
         bool KeywordSearch(const wxString& keyword)
         {
-            CreateHelpWindow(); return KeywordSearch(keyword);
+            CreateHelpWindow(); return m_helpFrame->KeywordSearch(keyword);
         }
         wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
         void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString)
         {
             m_Config = config;
             m_ConfigRoot = rootpath;
+            if (m_helpFrame) m_helpFrame -> UseConfig(config, rootpath);
             ReadCustomization(config, rootpath);
         }
         // Assigns config object to the Ctrl. This config is then
@@ -65,14 +66,15 @@ class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler
         // Ctrl and it's wxHtmlWindow
         virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         virtual void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
-        virtual void CreateHelpWindow(bool show_progress = FALSE);
+
+    protected:
+        virtual void CreateHelpWindow();
         virtual void DestroyHelpWindow()
         {
             //if (m_Config) WriteCustomization(m_Config, m_ConfigRoot);
             if (m_helpFrame) m_helpFrame->Destroy();
         }
 
-    protected:
         void OnCloseFrame(wxCloseEvent& evt) { m_helpFrame = NULL; evt.Skip(); }
         wxHtmlHelpData m_helpData;
         wxHtmlHelpFrame* m_helpFrame;