A better fix for wxHash{Map,Set} with g++ 4.7.

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index cc8806b275ed124df75f49670e191cbece103ace..b351bf4d7e7028342cf44bb75b38fa054a3746d2 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -40,7 +40,7 @@ class WXDLLIMPEXP_FWD_BASE wxFFile;
 
 // this symbol is defined for the platforms where file systems use volumes in
 // paths
-#if defined(__WXMSW__) || defined(__DOS__) || defined(__OS2__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
     #define wxHAS_FILESYSTEM_VOLUMES
 #endif
 
@@ -65,15 +65,14 @@ enum wxPathFormat
     wxPATH_MAX // Not a valid value for specifying path format
 };
 
-// different convention that may be used with GetHumanReadableSize()
+// different conventions that may be used with GetHumanReadableSize()
 enum wxSizeConvention
 {
-    wxSIZE_CONV_TRADIONAL,  // 1024 bytes = 1 KB
-    wxSIZE_CONV_IEC,        // 1024 bytes = 1 KiB
-    wxSIZE_CONV_SI          // 1000 bytes = 1 KB
+    wxSIZE_CONV_TRADITIONAL,  // 1024 bytes = 1 KB
+    wxSIZE_CONV_IEC,          // 1024 bytes = 1 KiB
+    wxSIZE_CONV_SI            // 1000 bytes = 1 KB
 };
 
-
 // the kind of normalization to do with the file name: these values can be
 // or'd together to perform several operations at once
 enum wxPathNormalize
@@ -215,14 +214,20 @@ public:
                 !m_ext.empty() || m_hasExt;
     }
 
-        // does the file with this name exists?
+        // does the file with this name exist?
     bool FileExists() const;
     static bool FileExists( const wxString &file );
 
-        // does the directory with this name exists?
+        // does the directory with this name exist?
     bool DirExists() const;
     static bool DirExists( const wxString &dir );
 
+        // does anything at all with this name (i.e. file, directory or some
+        // other file system object such as a device, socket, ...) exist?
+    bool Exists() const { return Exists(GetFullPath()); }
+    static bool Exists(const wxString& path);
+
+
         // checks on most common flags for files/directories;
         // more platform-specific features (like e.g. Unix permissions) are not
         // available in wxFileName
@@ -552,12 +557,12 @@ public:
     wxString
     GetHumanReadableSize(const wxString& nullsize = _("Not available"),
                          int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_TRADIONAL) const;
+                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
     static wxString
     GetHumanReadableSize(const wxULongLong& sz,
                          const wxString& nullsize = _("Not available"),
                          int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_TRADIONAL);
+                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
 #endif // wxUSE_LONGLONG