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 4b52caf81b1dd78bb5c0816cd89b91d6a4ab86d7..6700a6f6f3b493c6d6d91a5ce1bf0d1836adf40b 100644 (file)
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -14,6 +14,8 @@
 
 #include "wx/wx.h"
 
+#if wxUSE_HELP
+
 #include "wx/helpbase.h"
 
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
@@ -28,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();
@@ -42,9 +45,12 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 protected:
   wxString m_helpFile;
 private:
-  // virtual function hiding supression :: do not use
-    bool Initialize(const wxString& file, int WXUNUSED(server) ) { return(Initialize(file)); }
+    // virtual function hiding supression :: do not use
+    bool Initialize(const wxString& rFile, int WXUNUSED(nServer) ) { return(Initialize(rFile)); }
+    bool DisplaySection(const wxString& rSection) { return wxHelpControllerBase::DisplaySection(rSection); }
 };
 
+#endif //wxUSE_HELP
+
 #endif
     // _WX_HELPWIN_H_