Blindly added wxImageList::replace( int, bitmap, mask )

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

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 6c3cb0374769e94fab3eff70627975a995c4bab1..72afc643dc2fb06618f30b97846fa56695de322e 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -6,16 +6,12 @@
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPCHM_H_
 #define _WX_HELPCHM_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpchm.h"
-#endif
-
 #if wxUSE_MS_HTML_HELP
 
 #include "wx/helpbase.h"
@@ -23,11 +19,12 @@
 class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase
 {
 public:
-    wxCHMHelpController() { }
+    wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
     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);
@@ -37,7 +34,8 @@ 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();
 
     wxString GetHelpFile() const { return m_helpFile; }