X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4876ba0b23ee5be5f165cd4f0f53d6a4d4d46fa4..f068697b463e8ee2787e867597ab74c68e94aba6:/include/wx/filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index eca68ca64b..67fae5e069 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -168,13 +168,9 @@ enum wxFileKind
 
     #undef wxHAS_HUGE_FILES
 
-    // detect compilers which have support for huge files (notice that the
-    // MSVC falls under _INTEGRAL_MAX_BITS >= 64 branch, so we don't have to
-    // test for it explicitly)
-    #if defined(_INTEGRAL_MAX_BITS)
-        #if _INTEGRAL_MAX_BITS >= 64
-            #define wxHAS_HUGE_FILES 1
-        #endif
+    // detect compilers which have support for huge files
+    #if defined(__VISUALC__)
+	#define wxHAS_HUGE_FILES 1
     #elif defined(__MINGW32__)
         #define wxHAS_HUGE_FILES 1
     #elif defined(_LARGE_FILES)
@@ -239,7 +235,24 @@ enum wxFileKind
 
     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU
-            #include "wx/msw/mslu.h"
+            // implement the missing file functions in Win9x ourselves
+            #if defined( __VISUALC__ ) \
+                || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
+                || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
+                || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) ) \
+                || defined(__DMC__)
+                #ifdef __BORLANDC__
+                    // BCC has _stati64() function but struct stati64
+                    #define _stati64 stati64
+                #endif // __BORLANDC__
+
+                WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode);
+                WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode);
+                WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name);
+                WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
+                WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer);
+                WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer);
+            #endif // Windows compilers with MSLU support
 
             #define   wxOpen       wxMSLU__wopen
 
@@ -656,7 +669,7 @@ public:
     void AddEnvList(const wxString& envVariable);
 
     // Adds given path to this list
-    void Add(const wxString& path);
+    bool Add(const wxString& path);
     void Add(const wxArrayString &paths);
 
     // Find the first full path for which the file exists
@@ -667,10 +680,12 @@ public:
     wxString FindAbsoluteValidPath(const wxString& filename) const;
 
     // Given full path and filename, add path to list
-    void EnsureFileAccessible(const wxString& path);
+    bool EnsureFileAccessible(const wxString& path);
 
+#if WXWIN_COMPATIBILITY_2_6
     // Returns true if the path is in the list
     wxDEPRECATED( bool Member(const wxString& path) const );
+#endif
 };
 
 #endif // _WX_FILEFN_H_