X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27b2dd53f629a78266c51d1b0b5db918401dcd4f..7bea7b91482dd41568e11fc9e91ce485db680ddd:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 1d0b0bac66..f2e52808f6 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -59,7 +59,7 @@ #endif #if defined(__WINDOWS__) && !defined(__WXMICROWIN__) -#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__) +#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__) && !defined(__CYGWIN__) #include #include #include @@ -367,7 +367,7 @@ const int wxInvalidOffset = -1; WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename); // does the path exist? (may have or not '/' or '\\' at the end) -WXDLLIMPEXP_BASE bool wxPathExists(const wxChar *pszPathName); +WXDLLIMPEXP_BASE bool wxDirExists(const wxChar *pszPathName); WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename); @@ -462,9 +462,14 @@ WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd); WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp); // compatibility defines, don't use in new code -#if WXWIN_COMPATIBILITY_2_4 - #define wxDirExists wxPathExists -#endif +// consider removal droping 2.4 compatibility +// #if WXWIN_COMPATIBILITY_2_4 +wxDEPRECATED( inline bool wxPathExists(const wxChar *pszPathName) ); +inline bool wxPathExists(const wxChar *pszPathName) +{ + return wxDirExists(pszPathName); +} +// #endif //WXWIN_COMPATIBILITY_2_4 // ---------------------------------------------------------------------------- // separators in file names