X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506c7b5b69c42378a3ec53bf6084b909c0c05ccf..af7e08a4a5fe415c5792ee14278736b96b951a53:/include/wx/msw/helpbest.h diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index b8bd0bc1a9..452a074c2c 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) @@ -85,7 +87,7 @@ public: virtual void SetFrameParameters(const wxString& title, const wxSize& size, const wxPoint& pos = wxDefaultPosition, - bool newFrameEachTime = FALSE) + bool newFrameEachTime = false) { m_helpController->SetFrameParameters( title, size, pos, newFrameEachTime );