cleaning up problems after string changes

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

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index d0203d57e6674a7931a60f7b147a4110a5ef2179..24321b416675aab8cd2f90753a754fbfea6a07d7 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -6,16 +6,12 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpwin.h"
-#endif
-

 #include "wx/wx.h"
 
 #if wxUSE_HELP
 #include "wx/wx.h"
 
 #if wxUSE_HELP


@@ -25,21 +21,24 @@
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {
     DECLARE_CLASS(wxWinHelpController)
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {
     DECLARE_CLASS(wxWinHelpController)

-        
+

 public:
 public:

-    wxWinHelpController() {};
-    ~wxWinHelpController() {};
+    wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
+    virtual ~wxWinHelpController() {}

 
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);
 
     // 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);
     virtual bool DisplayContents();
     virtual bool DisplaySection(int sectionNo);
 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString);
     virtual bool DisplayContents();
     virtual bool DisplaySection(int sectionNo);

+    virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); }

     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);

-    virtual bool KeywordSearch(const wxString& k);
+    virtual bool KeywordSearch(const wxString& k,
+                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL);

     virtual bool Quit();
 
     inline wxString GetHelpFile() const { return m_helpFile; }
     virtual bool Quit();
 
     inline wxString GetHelpFile() const { return m_helpFile; }


@@ -47,7 +46,7 @@ public:
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;

-    
+

 private:
     wxString m_helpFile;
 };
 private:
     wxString m_helpFile;
 };