X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b75b49b6011afdd1331334a49ab66a569f72f97..b1944ebcd065d61011e2a9187064089c3aef16aa:/include/wx/html/helpdata.h diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index d2ceab174f..906d12b13b 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 @@ -127,12 +128,11 @@ class WXDLLEXPORT wxHtmlSearchStatus wxString m_Keyword, m_Name; wxChar *m_LastPage; wxHtmlContentsItem* m_ContentsItem; - bool m_Active; // search is not finished + bool m_Active; // search is not finished int m_CurIndex; // where we are now int m_MaxIndex; // number of files we search // For progress bar: 100*curindex/maxindex = % complete -} -; +}; class WXDLLEXPORT wxHtmlHelpData : public wxObject { @@ -153,7 +153,9 @@ class WXDLLEXPORT wxHtmlHelpData : public wxObject // Adds new book. 'book' is location of .htb file (stands for "html book"). // See documentation for details on its format. // Returns success. - bool AddBookParam(const wxString& title, const wxString& contfile, + bool AddBookParam(const wxFSFile& bookfile, + wxFontEncoding encoding, + const wxString& title, const wxString& contfile, const wxString& indexfile = wxEmptyString, const wxString& deftopic = wxEmptyString, const wxString& path = wxEmptyString); @@ -190,8 +192,7 @@ class WXDLLEXPORT wxHtmlHelpData : public wxObject // Reads binary book bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f); // Writes binary book -} -; +}; #endif