X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0912690b65b3c58c0e12870fb971675ca5572ae6..eba99da4c0563e6508761272a1e1f1b791d0af6b:/include/wx/filefn.h?ds=sidebyside diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 976292adb9..1d0b0bac66 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -148,10 +148,9 @@ enum wxFileKind int wxWrite(int fd, const void *buf, unsigned int count); int wxEof(int fd); wxFileOffset wxSeek(int fd, wxFileOffset offset, int origin); - inline HANDLE wxGetOSFHandle(int fd) { return (HANDLE)fd; } #define wxLSeek wxSeek wxFileOffset wxTell(int fd); - + // always Unicode under WinCE #define wxMkDir _wmkdir #define wxRmDir _wrmdir @@ -352,11 +351,6 @@ enum wxFileKind #endif #endif // platforms -#if defined __WXMSW__ && !defined __WXWINCE__ - // get the HANDLE associated with a file descriptor - inline HANDLE wxGetOSFHandle(int fd) { return (HANDLE)_get_osfhandle(fd); } -#endif - #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 // // VisualAge C++ V4.0 cannot have any external linkage const decs @@ -465,10 +459,12 @@ WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0); // Return the type of an open file WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd); -inline wxFileKind wxGetFileKind (FILE *fp) { return wxGetFileKind(fileno(fp)); } +WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp); // compatibility defines, don't use in new code -#define wxDirExists wxPathExists +#if WXWIN_COMPATIBILITY_2_4 + #define wxDirExists wxPathExists +#endif // ---------------------------------------------------------------------------- // separators in file names