1. added range checks in wxGridStringTable

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

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 30dcac00de22d9d4d19a5ae4d885353678635d76..9263ab6026aaa63f00f584ddaeeee8bc8df6506e 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -51,29 +51,24 @@ 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;
-            ReadCustomization(config, rootpath);
-        }
+        void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
+       
         // Assigns config object to the Ctrl. This config is then
         // used in subsequent calls to Read/WriteCustomization of both help
         // 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;