moving native format generation into bitmap ref data because of the owner semantics...

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 80cc1db89c0fc04ca7774d1d9c8305bf5e2d7657..8894f9a788e207204e94b4f3efb27c41ab10788e 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -122,12 +122,12 @@ enum wxSeekMode
   wxFromEnd
 };
 
-enum wxFileTypeEnum
+enum wxFileKind
 {
-  wxFILE_TYPE_UNKNOWN,
-  wxFILE_TYPE_DISK,     // a file supporting seeking to arbitrary offsets
-  wxFILE_TYPE_TERMINAL, // a tty
-  wxFILE_TYPE_PIPE      // a pipe
+  wxFILE_KIND_UNKNOWN,
+  wxFILE_KIND_DISK,     // a file supporting seeking to arbitrary offsets
+  wxFILE_KIND_TERMINAL, // a tty
+  wxFILE_KIND_PIPE      // a pipe
 };
 
 // ----------------------------------------------------------------------------
@@ -352,9 +352,15 @@ enum wxFileTypeEnum
     #endif
 #endif // platforms
 
-#if defined __WXMSW__ && !defined __WXWINCE__ 
+#if defined(__WXMSW__) && !defined(__WXWINCE__)
     // get the HANDLE associated with a file descriptor
-    inline HANDLE wxGetOSFHandle(int fd) { return (HANDLE)_get_osfhandle(fd); }
+#   ifdef __CYGWIN__
+#       include "wx/msw/private.h" // for HANDLE
+#       include <io.h> // 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
@@ -464,8 +470,8 @@ WXDLLIMPEXP_BASE bool wxMkdir(const wxString& dir, int perm = 0777);
 WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
 
 // Return the type of an open file
-WXDLLIMPEXP_BASE wxFileTypeEnum wxGetFileType(int fd);
-inline wxFileTypeEnum wxGetFileType(FILE *fp) { return wxGetFileType(fileno(fp)); }
+WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
+inline wxFileKind wxGetFileKind (FILE *fp) { return wxGetFileKind(fileno(fp)); }
 
 // compatibility defines, don't use in new code
 #define wxDirExists wxPathExists