Changed all symbols with the name "id" to "timerid" to allow Objective-C++

[wxWidgets.git] / include / wx / mac / helpxxxx.h

diff --git a/include/wx/mac/helpxxxx.h b/include/wx/mac/helpxxxx.h
index 188eb37306b045ab9e482adcca1fc20b69ed3814..a33c0737a5ea232bfa531c6e6220c73324b87afb 100644 (file)
--- a/include/wx/mac/helpxxxx.h
+++ b/include/wx/mac/helpxxxx.h
@@ -7,13 +7,13 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPXXXX_H_
 #define _WX_HELPXXXX_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "helpxxxx.h"
 #endif
 
@@ -37,7 +37,8 @@ class WXDLLEXPORT wxXXXXHelpController: public wxHelpControllerBase
   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();