Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h
index 4b52caf81b1dd78bb5c0816cd89b91d6a4ab86d7..c38ea9f657d5e03ca71dc30caa1c4a3c2d0168c3 100644 (file)
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -14,6 +14,8 @@
 
 #include "wx/wx.h"
 
 
 #include "wx/wx.h"
 

+#if wxUSE_HELP
+

 #include "wx/helpbase.h"
 
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 #include "wx/helpbase.h"
 
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase


@@ -32,7 +34,8 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
   virtual bool DisplayContents();
   virtual bool DisplaySection(int sectionNo);
   virtual bool DisplayBlock(long blockNo);
   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();
 
   virtual bool Quit();
   virtual void OnQuit();


@@ -42,9 +45,12 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 protected:
   wxString m_helpFile;
 private:
 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_
 #endif
     // _WX_HELPWIN_H_