Deprecated SetItemImage with 2 image ids

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 2ad2b9680a4339583acd413b815e190a2fe77f8c..69e95031d429652dc029440dc0786b0b2f6173cf 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -107,7 +107,7 @@
     #endif
 #endif
 
-#if defined(__VISUALC__) || ( defined(__MWERKS__) && defined( __INTEL__) )
+#if (defined(__VISUALC__) && !defined(__WXWINCE__)) || ( defined(__MWERKS__) && defined( __INTEL__) )
     typedef _off_t off_t;
 #elif defined(__SYMANTEC__)
     typedef long off_t;
@@ -129,7 +129,7 @@ enum wxSeekMode
 
 // Wrappers around Win32 api functions like CreateFile, ReadFile and such
 // Implemented in filefnwce.cpp
-#if defined( __WINCE__)
+#if defined( __WXWINCE__)
     typedef __int64 wxFileOffset;
     #define wxFileOffsetFmtSpec _("I64")
     int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
@@ -210,7 +210,7 @@ enum wxSeekMode
             #define wxWrite        _write(fd, (const char *)buf, nCount)
         #endif
     #else
-        #ifdef __DMC__
+        #if defined(__DMC__) || defined(__WATCOMC__)
             #define wxRead        ::read
             #define wxWrite       ::write
         #else
@@ -228,7 +228,11 @@ enum wxSeekMode
         #define   wxTell       _tell
     #endif
     #define   wxFsync      _commit
-    #define   wxEof        _eof
+    #if defined(__WATCOMC__)
+        #define   wxEof        ::eof
+    #else
+        #define   wxEof        _eof
+    #endif
 
     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU