made wxCommandEvent::GetInt() return int, not long (patch 1473771)

[wxWidgets.git] / include / wx / os2 / helpwin.h

diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h
index 8970ab8a47dd0ecc5235005e54ac171dc48ce81b..6700a6f6f3b493c6d6d91a5ce1bf0d1836adf40b 100644 (file)
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
-//EK #include "wx/wx.h"
+#include "wx/wx.h"
 
 #if wxUSE_HELP
 
@@ -30,11 +30,12 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
   virtual bool Initialize(const wxString& file);
 
   // If file is "", reloads file given  in Initialize
-  virtual bool LoadFile(const wxString& file = "");
+  virtual bool LoadFile(const wxString& file = wxEmptyString);
   virtual bool DisplayContents();
   virtual bool DisplaySection(int sectionNo);
   virtual bool DisplayBlock(long blockNo);
-  virtual bool KeywordSearch(const wxString& k);
+  virtual bool KeywordSearch(const wxString& k,
+                             wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
 
   virtual bool Quit();
   virtual void OnQuit();