added wxUSE_TIPWINDOW

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index cf12b36501ea056dd90a0d9151467b08cf52be4a..95666dc2b9e7ba0ee0364dde751640e3af4acba2 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -105,21 +105,31 @@ public:
 
         // the same for delayed initialization
 
-        // VZ: wouldn't it be better to call this Create() for consistency with
-        //     all GUI classes? Personally, I like Set() more than Assign() too
-
     void Assign(const wxFileName& filepath);
+
     void Assign(const wxString& fullpath,
                 wxPathFormat format = wxPATH_NATIVE);
+
+    void Assign(const wxString& volume,
+                const wxString& path,
+                const wxString& name,
+                const wxString& ext,
+                wxPathFormat format = wxPATH_NATIVE);
+
     void Assign(const wxString& path,
                 const wxString& name,
                 wxPathFormat format = wxPATH_NATIVE);
+
     void Assign(const wxString& path,
                 const wxString& name,
                 const wxString& ext,
-                wxPathFormat format = wxPATH_NATIVE);
-    void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
-        { Assign(dir, _T(""), format); }
+                wxPathFormat format = wxPATH_NATIVE)
+    {
+        // empty volume
+        Assign(_T(""), path, name, ext, format);
+    }
+
+    void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE);
 
         // assorted assignment operators
 
@@ -179,8 +189,8 @@ public:
     // various file/dir operations
 
         // retrieve the value of the current working directory
-    void AssignCwd();
-    static wxString GetCwd();
+    void AssignCwd(const wxString& volume = wxEmptyString);
+    static wxString GetCwd(const wxString& volume = wxEmptyString);
 
         // change the current working directory
     bool SetCwd();
@@ -224,10 +234,22 @@ public:
         { return *this == wxFileName(filename); }
 
     // Tests
+
+        // are the file names of this type cases sensitive?
     static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
-    bool IsRelative( wxPathFormat format = wxPATH_NATIVE );
+
+        // is this filename absolute?
     bool IsAbsolute( wxPathFormat format = wxPATH_NATIVE );
 
+        // is this filename relative?
+    bool IsRelative( wxPathFormat format = wxPATH_NATIVE )
+        { return !IsAbsolute(format); }
+
+    // Information about path format
+
+    // get the string separating the volume from the path for this format
+    static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE);
+
     // get the string of path separators for this format
     static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE);
 
@@ -247,17 +269,21 @@ public:
     // Other accessors
     void SetExt( const wxString &ext )          { m_ext = ext; }
     wxString GetExt() const                     { return m_ext; }
-    bool HasExt() const                         { return !m_ext.IsEmpty(); }
+    bool HasExt() const                         { return !m_ext.empty(); }
 
     void SetName( const wxString &name )        { m_name = name; }
     wxString GetName() const                    { return m_name; }
-    bool HasName() const                        { return !m_name.IsEmpty(); }
+    bool HasName() const                        { return !m_name.empty(); }
+
+    void SetVolume( const wxString &volume )    { m_volume = volume; }
+    wxString GetVolume() const                  { return m_volume; }
+    bool HasVolume() const                      { return !m_volume.empty(); }
 
     // full name is the file name + extension (but without the path)
     void SetFullName(const wxString& fullname);
     wxString GetFullName() const;
 
-    const wxArrayString &GetDirs() const        { return m_dirs; }
+    const wxArrayString& GetDirs() const        { return m_dirs; }
 
     // Construct path only - possibly with the trailing separator
     wxString GetPath( bool add_separator = FALSE,
@@ -281,8 +307,16 @@ public:
         // get the canonical path format for this platform
     static wxPathFormat GetFormat( wxPathFormat format = wxPATH_NATIVE );
 
-        // split a fullpath into path, (base) name and ext (all of the pointers
-        // can be NULL)
+        // split a fullpath into the volume, path, (base) name and extension
+        // (all of the pointers can be NULL)
+    static void SplitPath(const wxString& fullpath,
+                          wxString *volume,
+                          wxString *path,
+                          wxString *name,
+                          wxString *ext,
+                          wxPathFormat format = wxPATH_NATIVE);
+
+        // compatibility version
     static void SplitPath(const wxString& fullpath,
                           wxString *path,
                           wxString *name,
@@ -290,6 +324,9 @@ public:
                           wxPathFormat format = wxPATH_NATIVE);
 
 private:
+    // the drive/volume/device specification (always empty for Unix)
+    wxString        m_volume;
+
     // the path components of the file
     wxArrayString   m_dirs;