Updated to Scintilla 1.54

[wxWidgets.git] / include / wx / msw / helpchm.h

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 4a172009be9a464ed4aaeb1aa3e0933a7b882772..09c621b5f33e4235cae9a7b66a82d5e31706da47 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -12,27 +12,24 @@
 #ifndef _WX_HELPCHM_H_
 #define _WX_HELPCHM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "helpchm.h"
 #endif
 
-#include "wx/wx.h"
-
-#if wxUSE_HELP
+#if wxUSE_MS_HTML_HELP
 
 #include "wx/helpbase.h"
 
-class WXDLLEXPORT wxCHMHelpController: public wxHelpControllerBase
+class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase
 {
-    DECLARE_CLASS(wxCHMHelpController)
-        
 public:
-    wxCHMHelpController() {}
-    ~wxCHMHelpController() {}
-    
+    wxCHMHelpController() { }
+    virtual ~wxCHMHelpController();
+
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);
-    
+    virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }
+
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString);
     virtual bool DisplayContents();
@@ -41,19 +38,23 @@ public:
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
-    virtual bool KeywordSearch(const wxString& k);
+    virtual bool KeywordSearch(const wxString& k,
+                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
     virtual bool Quit();
 
-    inline wxString GetHelpFile() const { return m_helpFile; }
-    
+    wxString GetHelpFile() const { return m_helpFile; }
+
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
-    
+
 protected:
     wxString m_helpFile;
+
+    DECLARE_CLASS(wxCHMHelpController)
 };
 
-#endif // wxUSE_HELP
+#endif // wxUSE_MS_HTML_HELP
+
 #endif
 // _WX_HELPCHM_H_