X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78743282716f48121aa17cc76068bfdfbfc4e9bc..4791fafb6d69dda73abc0a92c6a9ab19ce13801a:/src/generic/helpext.cpp?ds=sidebyside diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index 30e80e6850..840ae94fa0 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -19,7 +19,7 @@ #pragma hdrstop #endif -#if wxUSE_HELP && !defined(__WXWINCE__) +#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__)) #ifndef WX_PRECOMP #include "wx/setup.h" @@ -45,6 +45,7 @@ #ifdef __WXMSW__ #include +#include "wx/msw/winundef.h" #endif // ---------------------------------------------------------------------------- @@ -258,7 +259,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile) { wxString newfile; newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName(); - if(wxDirExists(newfile)) + if(wxPathExists(newfile)) file = newfile; else { @@ -266,13 +267,13 @@ bool wxExtHelpController::LoadFile(const wxString& ifile) const wxChar *cptr = wxGetLocale()->GetName().c_str(); while(*cptr && *cptr != wxT('_')) newfile << *(cptr++); - if(wxDirExists(newfile)) + if(wxPathExists(newfile)) file = newfile; } } #endif - if(! wxDirExists(file)) + if(! wxPathExists(file)) return false; mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;