X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cc5a448dc310ace36a4d5ef47121d86cee131e5..7d0180d415f3cce126abebed2ef1d0fde00bcc61:/src/generic/helphtml.cpp diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp index 21c1c6f4d4..8aa2840806 100644 --- a/src/generic/helphtml.cpp +++ b/src/generic/helphtml.cpp @@ -50,12 +50,6 @@ /// Name for map file. #define WXEXTHELP_MAPFILE _T("wxhelp.map") -/// Path separator. -#ifdef __WXMSW__ -#define WXEXTHELP_SEPARATOR _T('\\') -#else -#define WXEXTHELP_SEPARATOR _T('/') -#endif /// Maximum line length in map file. #define WXEXTHELP_BUFLEN 512 /// Character introducing comments/documentation field in map file. @@ -139,7 +133,11 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile) wxChar* f = wxGetWorkingDirectory(); file = f; delete[] f; // wxGetWorkingDirectory returns new memory +#ifdef __WXMAC__ + file << ifile; +#else file << WXEXTHELP_SEPARATOR << ifile; +#endif } else file = ifile;