X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35822af105b8ea388589c0433c014735c84feac..fd368161d9d135bab529e92ef6b9a1bfc2716acd:/include/wx/html/helpdata.h diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index 972c90f732..e5b96e3965 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -24,6 +24,7 @@ #include "wx/string.h" #include "wx/filesys.h" #include "wx/dynarray.h" +#include "wx/font.h" //-------------------------------------------------------------------------------- // helper classes & structs @@ -84,7 +85,7 @@ class WXDLLEXPORT wxSearchEngine : public wxObject { public: wxSearchEngine() : wxObject() {m_Keyword = NULL; } - ~wxSearchEngine() {if (m_Keyword) free(m_Keyword); } + ~wxSearchEngine() {if (m_Keyword) delete[] m_Keyword; } virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only); // Sets the keyword we will be searching for @@ -153,6 +154,7 @@ class WXDLLEXPORT wxHtmlHelpData : public wxObject // See documentation for details on its format. // Returns success. bool AddBookParam(const wxFSFile& bookfile, + wxFontEncoding encoding, const wxString& title, const wxString& contfile, const wxString& indexfile = wxEmptyString, const wxString& deftopic = wxEmptyString,