From 057b55b016d9e2076fde422f29948dc55e97f0d7 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 14 Jul 2001 11:29:26 +0000 Subject: [PATCH] AddBook ignores wxMac paths (still won't work) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/helpdata.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp index 97dd46a709..7cf0465e1e 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__ + // wxIsAbsolutePath is broken + bookFull = wxGetCwd() + ":" + book; + 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) -- 2.45.2