more fixes to HTML entities parsing when loading .hhk and .hhc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-27 19:40:20 +00:00
parent 1171e2e56e
commit 67c276bdb6
2 changed files with 16 additions and 34 deletions

View File

@@ -172,15 +172,12 @@ public:
// See documentation for details on its format.
// Returns success.
bool AddBook(const wxString& book);
#if WXWIN_COMPATIBILITY_2_4
wxDEPRECATED(
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) );
#endif
const wxString& path = wxEmptyString);
// Some accessing stuff:
@@ -206,13 +203,6 @@ protected:
int m_IndexCnt; // list of index items
protected:
bool AddBookParam(const wxFSFile& bookfile,
const wxString& charset,
const wxString& title, const wxString& contfile,
const wxString& indexfile = wxEmptyString,
const wxString& deftopic = wxEmptyString,
const wxString& path = wxEmptyString);
// Imports .hhp files (MS HTML Help Workshop)
bool LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys,
const wxString& indexfile, const wxString& contentsfile);