some setup.h changes for wxMovieCtrl

[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..6540fdce66bf0d027913a5139c8c292af73317b6 100644 (file)
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -6,13 +6,13 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "helpwce.cpp"
 #endif
 
@@ -23,8 +23,8 @@
 class WXDLLEXPORT wxWinceHelpController : public wxHelpControllerBase
 {
 public:
-    wxWinceHelpController() { }
-    virtual ~wxWinceHelpController();
+    wxWinceHelpController() {}
+    virtual ~wxWinceHelpController() {}
 
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);
@@ -37,7 +37,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; }