fixed wxGetKeyState to get current status of non-togle keys, and to

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

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index d0b8691ca12c8e083ae6fd5e52abf613cd0e50dc..06e6bdc7ee8dee4e219f8cce28e8118856914213 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -20,8 +20,8 @@
 
 #if wxUSE_WXHTML_HELP
 
 
 #if wxUSE_WXHTML_HELP
 

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

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

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

 
 #define wxID_HTML_HELPFRAME   (wxID_HIGHEST + 1)
 
 
 #define wxID_HTML_HELPFRAME   (wxID_HIGHEST + 1)
 


@@ -42,7 +42,8 @@ public:
     bool Display(int id);
     bool DisplayContents();
     bool DisplayIndex();
     bool Display(int id);
     bool DisplayContents();
     bool DisplayIndex();

-    bool KeywordSearch(const wxString& keyword);
+    bool KeywordSearch(const wxString& keyword,
+                       wxHelpSearchMode mode = wxHELP_SEARCH_ALL);

 
     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);