X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..c76b1a30faba8015cf9cb223cd0e01cb0d2f64d7:/src/html/helpdata.cpp?ds=inline diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp index 51d0f334d3..1864c907e5 100644 --- a/src/html/helpdata.cpp +++ b/src/html/helpdata.cpp @@ -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];