Ryan's cumulative wxActiveX and media control patch (1427775)

[wxWidgets.git] / include / wx / msw / wince / helpwce.h

diff --git a/include/wx/msw/wince/helpwce.h b/include/wx/msw/wince/helpwce.h
index f1de58b63214ca902e4ace2e50d4b8d74dffeff0..e41e27cf1f5f3f64149df64b30b528c1ddd46a5f 100644 (file)
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpwce.h
+// Name:        wx/msw/wince/helpwce.h
 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWCE_H_
 #define _WX_HELPWCE_H_
 
-#ifdef __GNUG__
-#pragma interface "helpwce.cpp"
-#endif
-
 #if wxUSE_HELP
 
 #include "wx/helpbase.h"
@@ -23,8 +19,8 @@
 class WXDLLEXPORT wxWinceHelpController : public wxHelpControllerBase
 {
 public:
-    wxWinceHelpController() { }
-    virtual ~wxWinceHelpController();
+    wxWinceHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
+    virtual ~wxWinceHelpController() {}
 
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);
@@ -37,7 +33,8 @@ public:
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
-    virtual bool KeywordSearch(const wxString& k);
+    virtual bool KeywordSearch(const wxString& k,
+                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
     virtual bool Quit();
 
     wxString GetHelpFile() const { return m_helpFile; }
@@ -49,7 +46,7 @@ protected:
     // View topic, or just the HTML file
     bool ViewURL(const wxString& topic = wxEmptyString);
 
-protected:
+private:
     wxString m_helpFile;
 
     DECLARE_CLASS(wxWinceHelpController)
@@ -59,4 +56,3 @@ protected:
 
 #endif
 // _WX_HELPWCE_H_
-