use 6px as the default wxSizer border in wxGTK to be a little bit closer to GNOME HIG

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

diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h
index 4b52caf81b1dd78bb5c0816cd89b91d6a4ab86d7..d8a2a0815034e4c985635fb25faf83b2323da230 100644 (file)
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpxxxx.h
+// Name:        wx/os2/helpwin.h

 // Purpose:     Help system: native implementation for your system.
 // Author:      David Webster
 // Modified by:
 // Purpose:     Help system: native implementation for your system.
 // Author:      David Webster
 // Modified by:

-// Created:      10/09/99
+// Created:     10/09/99

 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_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


@@ -22,17 +24,18 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 
  public:
   wxWinHelpController();
 
  public:
   wxWinHelpController();

-  ~wxWinHelpController();
+  virtual ~wxWinHelpController();

 
   // Must call this to set the filename and server name
   virtual bool Initialize(const wxString& file);
 
   // If file is "", reloads file given  in Initialize
 
   // Must call this to set the filename and server name
   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 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_