X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7722d490f224d8f292f27fd90b1f42a00e20da8b..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index a42adcc9c6..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,17 +351,6 @@ enum wxFileKind #endif #endif // platforms -#if defined __WXMSW__ && !defined __WXWINCE__ - // get the HANDLE associated with a file descriptor -# ifdef __CYGWIN__ -# include "wx/msw/private.h" // for HANDLE -# include // for get_osfhandle() - inline HANDLE wxGetOSFHandle(int fd) { return (HANDLE) get_osfhandle(fd); } -# else - inline HANDLE wxGetOSFHandle(int fd) { return (HANDLE) _get_osfhandle(fd); } -# endif -#endif - #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 // // VisualAge C++ V4.0 cannot have any external linkage const decs @@ -471,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