X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..ee65598f95309d64d69cfb4dd4191b3f567551fb:/src/html/helpdata.cpp diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp index 97dd46a709..6ba01be7f7 100644 --- a/src/html/helpdata.cpp +++ b/src/html/helpdata.cpp @@ -38,6 +38,7 @@ #include "wx/log.h" #include "wx/html/htmlpars.h" #include "wx/html/htmldefs.h" +#include "wx/filename.h" #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxHtmlBookRecArray) @@ -567,8 +568,15 @@ bool wxHtmlHelpData::AddBook(const wxString& book) index = wxEmptyString, charset = wxEmptyString; +#ifdef __WXMAC__ + 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() + "/" + book; +#endif fi = fsys.OpenFile(bookFull); if (fi == NULL)