X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe828a03f46181cc172bf61739fe09a043f73aea..1ac5cfc7c9d2df832a4e8f5737f43995e3308ab4:/include/wx/html/helpfrm.h diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index c9bae539a0..a678ef60a8 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -74,11 +74,17 @@ public: wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); } wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL, - wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString); + int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL +#if wxUSE_CONFIG + , wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString +#endif // wxUSE_CONFIG + ); bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE, - wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString); + int style = wxHF_DEFAULT_STYLE +#if wxUSE_CONFIG + , wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString +#endif // wxUSE_CONFIG + ); virtual ~wxHtmlHelpFrame(); /// Returns the data associated with the window. @@ -97,8 +103,10 @@ public: // (for title of displayed HTML page) void SetTitleFormat(const wxString& format); +#if wxUSE_CONFIG // For compatibility void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString); +#endif // wxUSE_CONFIG // Make the help controller's frame 'modal' if // needed @@ -139,7 +147,7 @@ protected: private: DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpFrame); }; #endif // wxUSE_WXHTML_HELP