wxACCEL_NONE -> wxACCEL_NORMAL

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

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 250527671484d4a9eba5965db51996e3387cde47..8ea6bf5ad2b41dfe43b1e042d9fe1fd7189c2e78 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -58,6 +58,7 @@ class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler
         {
             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,15 +66,14 @@ 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);
-        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(); }
+        virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data);
+    
+        virtual void CreateHelpWindow();
+        virtual void DestroyHelpWindow();
+
+        void OnCloseFrame(wxCloseEvent& evt);
         wxHtmlHelpData m_helpData;
         wxHtmlHelpFrame* m_helpFrame;
         wxConfigBase *m_Config;