extend GetAsBitmap with an optional subrect

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 7573a31f620b376b94a07d9bf2630f03c5952d8e..c0c7e140b973bb0ee9983f9543b4f7c0260d7314 100644 (file)
--- 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)
@@ -673,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
@@ -684,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_