1. GetCwd() now has the volume argument, Normalize() works correctly for the

paths without full path but with the volume
2. fixed old SplitPath() version without volume to behave in a backwards
   compatible way
3. added more docs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/filename.cpp

@@ -311,15 +311,33 @@ bool wxFileName::DirExists( const wxString &dir )
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------
 
-void wxFileName::AssignCwd()
+void wxFileName::AssignCwd(const wxString& volume)
 {
-    AssignDir(wxFileName::GetCwd());
+    AssignDir(wxFileName::GetCwd(volume));
 }
 
 /* static */
-wxString wxFileName::GetCwd()
+wxString wxFileName::GetCwd(const wxString& volume)
 {
-    return ::wxGetCwd();
+    // if we have the volume, we must get the current directory on this drive
+    // and to do this we have to chdir to this volume - at least under Windows,
+    // I don't know how to get the current drive on another volume elsewhere
+    // (TODO)
+    wxString cwdOld;
+    if ( !volume.empty() )
+    {
+        cwdOld = wxGetCwd();
+        SetCwd(volume + GetVolumeSeparator());
+    }
+
+    wxString cwd = ::wxGetCwd();
+
+    if ( !volume.empty() )
+    {
+        SetCwd(cwdOld);
+    }
+
+    return cwd;
 }
 
 bool wxFileName::SetCwd()
@@ -432,9 +450,13 @@ bool wxFileName::Normalize(wxPathNormalize flags,
     if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() )
     {
         if ( cwd.empty() )
-            curDir.AssignCwd();
-        else
+        {
+            curDir.AssignCwd(GetVolume());
+        }
+        else // cwd provided
+        {
             curDir.AssignDir(cwd);
+        }
 
         // the path may be not absolute because it doesn't have the volume name
         // but in this case we shouldn't modify the directory components of it
@@ -976,6 +998,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 // path splitting function
 // ----------------------------------------------------------------------------
 
+/* static */
 void wxFileName::SplitPath(const wxString& fullpathWithVolume,
                            wxString *pstrVolume,
                            wxString *pstrPath,
@@ -1121,6 +1144,22 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume,
     }
 }
 
+/* static */
+void wxFileName::SplitPath(const wxString& fullpath,
+                           wxString *path,
+                           wxString *name,
+                           wxString *ext,
+                           wxPathFormat format)
+{
+    wxString volume;
+    SplitPath(fullpath, &volume, path, name, ext, format);
+
+    if ( path && !volume.empty() )
+    {
+        path->Prepend(volume + GetVolumeSeparator(format));
+    }
+}
+
 // ----------------------------------------------------------------------------
 // time functions
 // ----------------------------------------------------------------------------