X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ffbc733a20ffbda22abece30b4a1afb5c8bc75d..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index dff1b66eee..b1df9ded52 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -81,23 +81,23 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #if wxUSE_UNICODE #if wxUSE_UNICODE_MSLU - WXDLLEXPORT int wxOpen(const wxChar *name, int flags, int mode); + #define wxOpen wxMSLU__wopen + #define wxAccess wxMSLU__waccess + #define wxMkDir wxMSLU__wmkdir + #define wxRmDir wxMSLU__wrmdir + #define wxStat wxMSLU__wstat #else #define wxOpen _wopen + #define wxAccess _waccess + #define wxMkDir _wmkdir + #define wxRmDir _wrmdir + #define wxStat _wstat #endif - #define wxAccess _waccess - - #define wxMkDir _wmkdir - #define wxRmDir _wrmdir - - #define wxStat _wstat #else // !wxUSE_UNICODE #define wxOpen _open #define wxAccess _access - #define wxMkDir _mkdir #define wxRmDir _rmdir - #define wxStat _stat #endif @@ -270,13 +270,13 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0); #define wxPATH_SEP_MAC wxT(";") // platform independent versions -#if defined(__UNIX__) && !defined(__GNUWIN32__) +#if defined(__UNIX__) && !defined(__CYGWIN__) #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX #define wxPATH_SEP wxPATH_SEP_UNIX #elif defined(__MAC__) #define wxFILE_SEP_PATH wxFILE_SEP_PATH_MAC #define wxPATH_SEP wxPATH_SEP_MAC -#elif defined(__GNUWIN32__) // Cygwin +#elif defined(__CYGWIN__) // Cygwin #define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS #define wxPATH_SEP wxPATH_SEP_UNIX #else // Windows and OS/2