Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backported wxHTML fixes

Browse Source 
Applied patch [ 654023 ] Enables HtmlHelp (native)

Also fixed the bad event table in helpfrm.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-16 10:23:20 +00:00
parent 4febf1174f
commit e815a4feaf
7 changed files with 79 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/html/helpdata.cpp
View File

@@ -570,7 +570,6 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
{
wxFSFile *fi;
wxFileSystem fsys;
wxString bookFull;
wxString title = _("noname"),
safetitle,
@@ -579,23 +578,13 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
index = wxEmptyString,
charset = wxEmptyString;
#if defined(__WXMAC__) && !defined(__DARWIN__)
if (wxIsAbsolutePath(book)) bookFull = book;
else bookFull = wxGetCwd() + book; // no slash or dot
wxFileName fn( bookFull );
bookFull = fn.GetFullPath( wxPATH_UNIX );
#else
if (wxIsAbsolutePath(book)) bookFull = book;
else bookFull = wxGetCwd() + wxT("/") + book;
#endif
fi = fsys.OpenFile(bookFull);
fi = fsys.OpenFile(book);
if (fi == NULL)
{
wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str());
wxLogError(_("Cannot open HTML help book: %s"), book.c_str());
return FALSE;
}
fsys.ChangePathTo(bookFull);
fsys.ChangePathTo(book);
const wxChar *lineptr;
wxChar linebuf[300];