X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..2cce66352fc23859e991c2e7658dbf1cdf8c4183:/include/wx/filename.h?ds=sidebyside

diff --git a/include/wx/filename.h b/include/wx/filename.h
index dd44465684..2887a3121b 100644
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -27,6 +27,8 @@
 #include "wx/filefn.h"
 #include "wx/datetime.h"
 #include "wx/intl.h"
+#include "wx/longlong.h"
+#include "wx/file.h"
 
 #if wxUSE_FILE
 class WXDLLIMPEXP_FWD_BASE wxFile;
@@ -36,6 +38,12 @@ class WXDLLIMPEXP_FWD_BASE wxFile;
 class WXDLLIMPEXP_FWD_BASE wxFFile;
 #endif
 
+// this symbol is defined for the platforms where file systems use volumes in
+// paths
+#if defined(__WXMSW__) || defined(__DOS__) || defined(__OS2__)
+    #define wxHAS_FILESYSTEM_VOLUMES
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -74,6 +82,7 @@ enum wxPathNormalize
 // what exactly should GetPath() return?
 enum
 {
+    wxPATH_NO_SEPARATOR  = 0x0000,  // for symmetry with wxPATH_GET_SEPARATOR
     wxPATH_GET_VOLUME    = 0x0001,  // include the volume if applicable
     wxPATH_GET_SEPARATOR = 0x0002   // terminate the path with the separator
 };
@@ -84,8 +93,10 @@ enum
     wxPATH_MKDIR_FULL    = 0x0001   // create directories recursively
 };
 
+#if wxUSE_LONGLONG
 // error code of wxFileName::GetSize()
-extern wxULongLong wxInvalidSize;
+extern WXDLLIMPEXP_DATA_BASE(const wxULongLong) wxInvalidSize;
+#endif // wxUSE_LONGLONG
 
 
 
@@ -164,7 +175,7 @@ public:
         // assorted assignment operators
 
     wxFileName& operator=(const wxFileName& filename)
-        { Assign(filename); return *this; }
+        { if (this != &filename) Assign(filename); return *this; }
 
     wxFileName& operator=(const wxString& filename)
         { Assign(filename); return *this; }
@@ -245,7 +256,7 @@ public:
     }
 #endif // wxUSE_DATETIME
 
-#ifdef __WXMAC__
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
     bool MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) ;
     bool MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) ;
     // gets the 'common' type and creator for a certain extension
@@ -298,8 +309,8 @@ public:
 #endif // wxUSE_FFILE
 
     // directory creation and removal.
-    bool Mkdir( int perm = 0777, int flags = 0);
-    static bool Mkdir( const wxString &dir, int perm = 0777, int flags = 0 );
+    bool Mkdir( int perm = wxS_DIR_DEFAULT, int flags = 0);
+    static bool Mkdir( const wxString &dir, int perm = wxS_DIR_DEFAULT, int flags = 0 );
 
     bool Rmdir();
     static bool Rmdir( const wxString &dir );
@@ -481,8 +492,14 @@ public:
                             wxString *path,
                             wxPathFormat format = wxPATH_NATIVE);
 
-    // Filesize
+#ifdef wxHAS_FILESYSTEM_VOLUMES
+        // return the string representing a file system volume, or drive
+    static wxString GetVolumeString(char drive, int flags = wxPATH_GET_SEPARATOR);
+#endif // wxHAS_FILESYSTEM_VOLUMES
+
+    // File size
 
+#if wxUSE_LONGLONG
         // returns the size of the given filename
     wxULongLong GetSize() const;
     static wxULongLong GetSize(const wxString &file);
@@ -493,6 +510,7 @@ public:
     static wxString GetHumanReadableSize(const wxULongLong &sz,
                                          const wxString &nullsize = wxGetTranslation(_T("Not available")),
                                          int precision = 1);
+#endif // wxUSE_LONGLONG
 
 
     // deprecated methods, don't use any more