Rename wxGenericImageList to wxImageList in generic wxListCtrl, too.

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

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index f31e41f874089ee476b2765005f6f0dbff9655be..cd1efd1aee248ea98ea33139ae1c8f37792471e8 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -18,7 +18,7 @@
 #pragma interface "helpctrl.h"
 #endif
 
 #pragma interface "helpctrl.h"
 #endif
 

-#if wxUSE_HTML
+#if wxUSE_WXHTML_HELP

 
 #include "wx/html/helpfrm.h"
 #include "wx/helpbase.h"
 
 #include "wx/html/helpfrm.h"
 #include "wx/helpbase.h"


@@ -36,26 +36,13 @@ public:
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }
     bool AddBook(const wxString& book, bool show_wait_msg = FALSE);
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }
     bool AddBook(const wxString& book, bool show_wait_msg = FALSE);

-    bool Display(const wxString& x)
-    {
-        CreateHelpWindow(); return m_helpFrame->Display(x);
-    }
-    bool Display(int id)
-    {
-        CreateHelpWindow(); return m_helpFrame->Display(id);
-    }
-    bool DisplayContents()
-    {
-        CreateHelpWindow(); return m_helpFrame->DisplayContents();
-    }
-    bool DisplayIndex()
-    {
-        CreateHelpWindow(); return m_helpFrame->DisplayIndex();
-    }
-    bool KeywordSearch(const wxString& keyword)
-    {
-        CreateHelpWindow(); return m_helpFrame->KeywordSearch(keyword);
-    }
+
+    bool Display(const wxString& x);
+    bool Display(int id);
+    bool DisplayContents();
+    bool DisplayIndex();
+    bool KeywordSearch(const wxString& keyword);
+

     wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
 
     wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
 


@@ -94,6 +81,10 @@ public:
 
     void OnCloseFrame(wxCloseEvent& evt);
 
 
     void OnCloseFrame(wxCloseEvent& evt);
 

+    // Make the help controller's frame 'modal' if
+    // needed
+    void AddGrabIfNeeded();
+

 protected:
     virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data);
 
 protected:
     virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data);
 


@@ -109,6 +100,6 @@ protected:
     // DECLARE_EVENT_TABLE()
 };
 
     // DECLARE_EVENT_TABLE()
 };
 

-#endif
+#endif // wxUSE_WXHTML_HELP

 
 #endif // _WX_HELPCTRL_H_
 
 #endif // _WX_HELPCTRL_H_