X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69b5cec2b0993ce4cd56f2e50ab94e5ebd20069c..4bf45c9ecafa14b167ef0c911a83cd5cc8fba4d2:/include/wx/msw/helpbest.h?ds=sidebyside diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index f176eaa893..5c735c65d9 100644 --- a/include/wx/msw/helpbest.h +++ b/include/wx/msw/helpbest.h @@ -16,7 +16,8 @@ #pragma interface "helpbest.h" #endif -#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP +#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \ + && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) #include "wx/helpbase.h" @@ -33,6 +34,7 @@ public: // 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) @@ -71,7 +73,7 @@ public: } virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) { return m_helpController->KeywordSearch( k, mode ); }