Avoid duplicated definition errors for wxLongToLongHashMap when both

[wxWidgets.git] / include / wx / generic / helpext.h

diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index 03c66e5fe3a9cac14cb98b94ae1ab29cee244373..b3af81566e8889df6c6a485f4b789713ccf173e8 100644 (file)
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -11,7 +11,7 @@
 
 #if wxUSE_HELP
 
 
 #if wxUSE_HELP
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #   pragma interface "wxexthlp.h"
 #endif
 
 #   pragma interface "wxexthlp.h"
 #endif
 


@@ -26,7 +26,7 @@
 #define WXEXTHELP_SEPARATOR _T('/')
 #endif
 
 #define WXEXTHELP_SEPARATOR _T('/')
 #endif
 

-class WXDLLEXPORT wxExtHelpMapList;
+class WXDLLIMPEXP_ADV wxExtHelpMapList;

 
 #ifndef WXEXTHELP_DEFAULTBROWSER
 /// Default browser name.
 
 #ifndef WXEXTHELP_DEFAULTBROWSER
 /// Default browser name.


@@ -54,7 +54,7 @@ class WXDLLEXPORT wxExtHelpMapList;
    Lines starting with ';' will be ignored.
 */
 
    Lines starting with ';' will be ignored.
 */
 

-class WXDLLEXPORT wxExtHelpController : public wxHelpControllerBase
+class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase

 {      
 DECLARE_CLASS(wxExtHelpController)
    public:
 {      
 DECLARE_CLASS(wxExtHelpController)
    public:


@@ -129,7 +129,8 @@ DECLARE_CLASS(wxExtHelpController)
        @key k string to search for, empty string will list all entries
        @return true on success
    */
        @key k string to search for, empty string will list all entries
        @return true on success
    */

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

 
    /// does nothing
    virtual bool Quit(void);
 
    /// does nothing
    virtual bool Quit(void);