removed wxLoadBitmap() introduced in 1.37 -> 1.38; just use DIBs under Windows CE...

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b780caad9a53fc0cfa39595a6ad601eaed3c036e..876619c2c7eb3d119e837001cc4ca0c6b8e35a32 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1858,43 +1858,47 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 
 // Return the type of an open file
 //
-wxFileTypeEnum wxGetFileType(int fd)
+wxFileKind wxGetFileKind(int fd)
 {
+#if !defined (__WXWINCE__)
     if (isatty(fd))
-        return wxFILE_TYPE_TERMINAL;
+        return wxFILE_KIND_TERMINAL;
+#endif
 
-#if defined __WXMSW__
+#if defined __WXWINCE__
+    return wxFILE_KIND_UNKNOWN;
+#elif defined __WXMSW__
     switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
     {
         case FILE_TYPE_DISK:
-            return wxFILE_TYPE_DISK;
+            return wxFILE_KIND_DISK;
         case FILE_TYPE_PIPE:
-            return wxFILE_TYPE_PIPE;
+            return wxFILE_KIND_PIPE;
     }
 
-    return wxFILE_TYPE_UNKNOWN;
+    return wxFILE_KIND_UNKNOWN;
 
 #elif defined __UNIX__
     struct stat st;
     fstat(fd, &st);
 
     if (S_ISFIFO(st.st_mode))
-        return wxFILE_TYPE_PIPE;
+        return wxFILE_KIND_PIPE;
     if (!S_ISREG(st.st_mode))
-        return wxFILE_TYPE_UNKNOWN;
+        return wxFILE_KIND_UNKNOWN;
 
     #if defined __VMS__
         if (st.st_fab_rfm != FAB$C_STMLF)
-            return wxFILE_TYPE_UNKNOWN;
+            return wxFILE_KIND_UNKNOWN;
     #endif
 
-    return wxFILE_TYPE_DISK;
+    return wxFILE_KIND_DISK;
 
 #else
     if (lseek(fd, 0, SEEK_CUR) != -1)
-        return wxFILE_TYPE_DISK;
+        return wxFILE_KIND_DISK;
     else
-        return wxFILE_TYPE_UNKNOWN;
+        return wxFILE_KIND_UNKNOWN;
 #endif
 }