Remove surplus wxTheApp from wxApp...

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index cf4867b024d762fdacb04dc5164aad0fa9f0c936..5c2f9b007c215bf932e347a4b0ae148284138c41 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -9,6 +9,49 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+/*
+   Here are brief descriptions of the filename formats supported by this class:
+
+   wxPATH_UNIX: standard Unix format, used under Darwin as well, absolute file
+                names have the form:
+                /dir1/dir2/.../dirN/filename, "." and ".." stand for the
+                current and parent directory respectively, "~" is parsed as the
+                user HOME and "~username" as the HOME of that user
+
+   wxPATH_DOS:  DOS/Windows format, absolute file names have the form:
+                drive:\dir1\dir2\...\dirN\filename.ext where drive is a single
+                letter. "." and ".." as for Unix but no "~".
+
+                There are also UNC names of the form \\share\fullpath
+
+   wxPATH_MAC:  Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file
+                names have the form
+                    volume:dir1:...:dirN:filename
+                and the relative file names are either
+                    :dir1:...:dirN:filename
+                or just
+                    filename
+                (although :filename works as well).
+                Since the volume is just part of the file path, it is not
+                treated like a separate entity as it is done under DOS and
+                VMS, it is just treated as another dir.
+
+   wxPATH_VMS:  VMS native format, absolute file names have the form
+                    <device>:[dir1.dir2.dir3]file.txt
+                or
+                    <device>:[000000.dir1.dir2.dir3]file.txt
+
+                the <device> is the physical device (i.e. disk). 000000 is the
+                root directory on the device which can be omitted.
+
+                Note that VMS uses different separators unlike Unix:
+                 : always after the device. If the path does not contain : than
+                   the default (the device of the current directory) is assumed.
+                 [ start of directory specyfication
+                 . separator between directory and subdirectory
+                 ] between directory and file
+ */
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -18,29 +61,28 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "filename.h"
+#pragma implementation "filename.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+#pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/intl.h"
-    #include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "wx/file.h"

 #endif
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 #endif
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"

-
-#if wxUSE_DYNLIB_CLASS
-#include "wx/dynlib.h"
-#endif
+#include "wx/file.h"
+//#include "wx/dynlib.h"        // see GetLongPath below, code disabled.

 
 // For GetShort/LongPathName
 #ifdef __WIN32__
 
 // For GetShort/LongPathName
 #ifdef __WIN32__


@@ -48,6 +90,133 @@
 #include "wx/msw/winundef.h"
 #endif
 
 #include "wx/msw/winundef.h"
 #endif
 

+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+// utime() is POSIX so should normally be available on all Unices
+#ifdef __UNIX_LIKE__
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+#ifdef __DJGPP__
+#include <unistd.h>
+#endif
+
+#ifdef __MWERKS__
+#include <stat.h>
+#include <unistd.h>
+#include <unix.h>
+#endif
+
+#ifdef __WATCOMC__
+#include <io.h>
+#include <sys/utime.h>
+#include <sys/stat.h>
+#endif
+
+#ifdef __VISAGECPP__
+#ifndef MAX_PATH
+#define MAX_PATH 256
+#endif
+#endif
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// small helper class which opens and closes the file - we use it just to get
+// a file handle for the given file name to pass it to some Win32 API function
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+
+class wxFileHandle
+{
+public:
+    wxFileHandle(const wxString& filename)
+    {
+        m_hFile = ::CreateFile
+                    (
+                     filename,          // name
+                     GENERIC_READ,      // access mask
+                     0,                 // no sharing
+                     NULL,              // no secutity attr
+                     OPEN_EXISTING,     // creation disposition
+                     0,                 // no flags
+                     NULL               // no template file
+                    );
+
+        if ( m_hFile == INVALID_HANDLE_VALUE )
+        {
+            wxLogSysError(_("Failed to open '%s' for reading"),
+                          filename.c_str());
+        }
+    }
+
+    ~wxFileHandle()
+    {
+        if ( m_hFile != INVALID_HANDLE_VALUE )
+        {
+            if ( !::CloseHandle(m_hFile) )
+            {
+                wxLogSysError(_("Failed to close file handle"));
+            }
+        }
+    }
+
+    // return TRUE only if the file could be opened successfully
+    bool IsOk() const { return m_hFile != INVALID_HANDLE_VALUE; }
+
+    // get the handle
+    operator HANDLE() const { return m_hFile; }
+
+private:
+    HANDLE m_hFile;
+};
+
+#endif // __WIN32__
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+
+// convert between wxDateTime and FILETIME which is a 64-bit value representing
+// the number of 100-nanosecond intervals since January 1, 1601.
+
+// the number of milliseconds between the Unix Epoch (January 1, 1970) and the
+// FILETIME reference point (January 1, 1601)
+static const wxLongLong FILETIME_EPOCH_OFFSET = wxLongLong(0xa97, 0x30b66800);
+
+static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft)
+{
+    wxLongLong ll(ft.dwHighDateTime, ft.dwLowDateTime);
+
+    // convert 100ns to ms
+    ll /= 10000;
+
+    // move it to our Epoch
+    ll -= FILETIME_EPOCH_OFFSET;
+
+    *dt = wxDateTime(ll);
+}
+
+static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt)
+{
+    // do the reverse of ConvertFileTimeToWx()
+    wxLongLong ll = dt.GetValue();
+    ll *= 10000;
+    ll += FILETIME_EPOCH_OFFSET;
+
+    ft->dwHighDateTime = ll.GetHi();
+    ft->dwLowDateTime = ll.GetLo();
+}
+
+#endif // __WIN32__
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -58,58 +227,155 @@
 
 void wxFileName::Assign( const wxFileName &filepath )
 {
 
 void wxFileName::Assign( const wxFileName &filepath )
 {

-    m_ext = filepath.GetExt();
-    m_name = filepath.GetName();
+    m_volume = filepath.GetVolume();

     m_dirs = filepath.GetDirs();
     m_dirs = filepath.GetDirs();

+    m_name = filepath.GetName();
+    m_ext = filepath.GetExt();
+    m_relative = filepath.IsRelative();

 }
 
 }
 

-void wxFileName::Assign( const wxString& path,
-                         const wxString& name,
-                         const wxString& ext,
-                         wxPathFormat format )
+void wxFileName::Assign(const wxString& volume,
+                        const wxString& path,
+                        const wxString& name,
+                        const wxString& ext,
+                        wxPathFormat format )

 {
 {

-    wxStringTokenizer tn(path, GetPathSeparators(format),
-                         wxTOKEN_RET_EMPTY_ALL);
-    bool first = TRUE;
+    SetPath( path, format );
+
+    m_volume = volume;
+    m_ext = ext;
+    m_name = name;
+}
+
+void wxFileName::SetPath( const wxString &path, wxPathFormat format )
+{
+    wxPathFormat my_format = GetFormat( format );
+    wxString my_path = path;
+

     m_dirs.Clear();
     m_dirs.Clear();

-    while ( tn.HasMoreTokens() )
+
+    if (!my_path.empty())

     {
     {

-        wxString token = tn.GetNextToken();
+        // 1) Determine if the path is relative or absolute.

 
 

-        // If the path starts with a slash, we need the first
-        // dir entry to be an empty for later reassembly.
-        if (first || !token.IsEmpty())
-            m_dirs.Add( token );
+        switch (my_format)
+        {
+            case wxPATH_MAC:
+                m_relative = ( my_path[0u] == wxT(':') );
+                // We then remove a leading ":". The reason is in our
+                // storage form for relative paths:
+                // ":dir:file.txt" actually means "./dir/file.txt" in
+                // DOS notation and should get stored as
+                // (relative) (dir) (file.txt)
+                // "::dir:file.txt" actually means "../dir/file.txt"
+                // stored as (relative) (..) (dir) (file.txt)
+                // This is important only for the Mac as an empty dir
+                // actually means <UP>, whereas under DOS, double
+                // slashes can be ignored: "\\\\" is the same as "\\".
+                if (m_relative)
+                    my_path.Remove( 0, 1 );
+                break;
+            case wxPATH_VMS:
+                // TODO: what is the relative path format here?
+                m_relative = FALSE;
+                break;
+            case wxPATH_UNIX:
+                m_relative = ( my_path[0u] != wxT('/') );
+                break;
+            case wxPATH_DOS:
+                m_relative = ( (my_path[0u] != wxT('/')) && (my_path[0u] != wxT('\\')) );
+                break;
+            default:
+                wxFAIL_MSG( wxT("error") );
+                break;
+        }

 
 

-        first = FALSE;
-    }
+        // 2) Break up the path into its members. If the original path
+        //    was just "/" or "\\", m_dirs will be empty. We know from
+        //    the m_relative field, if this means "nothing" or "root dir".

 
 

-    m_ext = ext;
-    m_name = name;
+        wxStringTokenizer tn( my_path, GetPathSeparators(my_format) );
+
+        while ( tn.HasMoreTokens() )
+        {
+            wxString token = tn.GetNextToken();
+
+            // Remove empty token under DOS and Unix, interpret them
+            // as .. under Mac.
+            if (token.empty())
+            {
+                if (my_format == wxPATH_MAC)
+                    m_dirs.Add( wxT("..") );
+                // else ignore
+            }
+            else
+            {
+               m_dirs.Add( token );
+            }
+        }
+    }
+    else
+    {
+        m_relative = TRUE;
+    }

 }
 
 void wxFileName::Assign(const wxString& fullpath,
                         wxPathFormat format)
 {
 }
 
 void wxFileName::Assign(const wxString& fullpath,
                         wxPathFormat format)
 {

-    wxString path, name, ext;
-    SplitPath(fullpath, &path, &name, &ext, format);
+    wxString volume, path, name, ext;
+    SplitPath(fullpath, &volume, &path, &name, &ext, format);

 
 

-    Assign(path, name, ext, format);
+    Assign(volume, path, name, ext, format);

 }
 
 }
 

-void wxFileName::Assign(const wxString& path,
+void wxFileName::Assign(const wxString& fullpathOrig,

                         const wxString& fullname,
                         wxPathFormat format)
 {
                         const wxString& fullname,
                         wxPathFormat format)
 {

-    wxString name, ext;
+    // always recognize fullpath as directory, even if it doesn't end with a
+    // slash
+    wxString fullpath = fullpathOrig;
+    if ( !wxEndsWithPathSeparator(fullpath) )
+    {
+        fullpath += GetPathSeparators(format)[0u];
+    }
+
+    wxString volume, path, name, ext;
+
+    // do some consistency checks in debug mode: the name should be really just
+    // the filename and the path should be really just a path
+#ifdef __WXDEBUG__
+    wxString pathDummy, nameDummy, extDummy;
+
+    SplitPath(fullname, &pathDummy, &name, &ext, format);
+
+    wxASSERT_MSG( pathDummy.empty(),
+                  _T("the file name shouldn't contain the path") );
+
+    SplitPath(fullpath, &volume, &path, &nameDummy, &extDummy, format);
+
+    wxASSERT_MSG( nameDummy.empty() && extDummy.empty(),
+                  _T("the path shouldn't contain file name nor extension") );
+
+#else // !__WXDEBUG__

     SplitPath(fullname, NULL /* no path */, &name, &ext, format);
     SplitPath(fullname, NULL /* no path */, &name, &ext, format);

+    SplitPath(fullpath, &volume, &path, NULL, NULL, format);
+#endif // __WXDEBUG__/!__WXDEBUG__
+
+    Assign(volume, path, name, ext, format);
+}

 
 

-    Assign(path, name, ext, format);
+void wxFileName::AssignDir(const wxString& dir, wxPathFormat format)
+{
+    Assign(dir, _T(""), format);

 }
 
 void wxFileName::Clear()
 {
     m_dirs.Clear();
 }
 
 void wxFileName::Clear()
 {
     m_dirs.Clear();

+
+    m_volume =

     m_name =
     m_ext = wxEmptyString;
 }
     m_name =
     m_ext = wxEmptyString;
 }


@@ -156,15 +422,33 @@ bool wxFileName::DirExists( const wxString &dir )
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------
 
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------
 

-void wxFileName::AssignCwd()
+void wxFileName::AssignCwd(const wxString& volume)

 {
 {

-    AssignDir(wxFileName::GetCwd());
+    AssignDir(wxFileName::GetCwd(volume));

 }
 
 /* static */
 }
 
 /* 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()
 }
 
 bool wxFileName::SetCwd()


@@ -187,17 +471,204 @@ wxString wxFileName::GetHomeDir()
     return ::wxGetHomeDir();
 }
 
     return ::wxGetHomeDir();
 }
 

-void wxFileName::AssignTempFileName( const wxString &prefix )
+void wxFileName::AssignTempFileName(const wxString& prefix, wxFile *fileTemp)

 {
 {

-    wxString fullname;
-    if ( wxGetTempFileName(prefix, fullname) )
+    wxString tempname = CreateTempFileName(prefix, fileTemp);
+    if ( tempname.empty() )

     {
     {

-        Assign(fullname);
+        // error, failed to get temp file name
+        Clear();

     }
     }

-    else // error
+    else // ok

     {
     {

-        Clear();
+        Assign(tempname);
+    }
+}
+
+/* static */
+wxString
+wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
+{
+    wxString path, dir, name;
+
+    // use the directory specified by the prefix
+    SplitPath(prefix, &dir, &name, NULL /* extension */);
+
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+
+#ifdef __WIN32__
+    if ( dir.empty() )
+    {
+        if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )
+        {
+            wxLogLastError(_T("GetTempPath"));
+        }
+
+        if ( dir.empty() )
+        {
+            // GetTempFileName() fails if we pass it an empty string
+            dir = _T('.');
+        }
+    }
+
+    if ( !::GetTempFileName(dir, name, 0, wxStringBuffer(path, MAX_PATH + 1)) )
+    {
+        wxLogLastError(_T("GetTempFileName"));
+
+        path.clear();
+    }
+#else // Win16
+    if ( !::GetTempFileName(NULL, prefix, 0, wxStringBuffer(path, 1025)) )
+    {
+        path.clear();
+    }
+#endif // Win32/16
+
+#elif defined(__WXPM__)
+    // for now just create a file
+    //
+    // future enhancements can be to set some extended attributes for file
+    // systems OS/2 supports that have them (HPFS, FAT32) and security
+    // (HPFS386)
+    static const wxChar *szMktempSuffix = wxT("XXX");
+    path << dir << _T('/') << name << szMktempSuffix;
+
+    // Temporarily remove - MN
+    #ifndef __WATCOMC__
+        ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL);
+    #endif
+
+#else // !Windows, !OS/2
+    if ( dir.empty() )
+    {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+        dir = wxMacFindFolder(  (short) kOnSystemDisk, pTemporaryFolder, kCreateFolder ) ;
+#else // !Mac
+        dir = wxGetenv(_T("TMP"));
+        if ( dir.empty() )
+        {
+            dir = wxGetenv(_T("TEMP"));
+        }
+
+        if ( dir.empty() )
+        {
+            // default
+            #ifdef __DOS__
+                dir = _T(".");
+            #else
+                dir = _T("/tmp");
+            #endif
+        }
+#endif // Mac/!Mac
+    }
+
+    path = dir;
+
+    if ( !wxEndsWithPathSeparator(dir) &&
+            (name.empty() || !wxIsPathSeparator(name[0u])) )
+    {
+        path += wxFILE_SEP_PATH;
+    }
+
+    path += name;
+
+#if defined(HAVE_MKSTEMP)
+    // scratch space for mkstemp()
+    path += _T("XXXXXX");
+
+    // can use the cast here because the length doesn't change and the string
+    // is not shared
+    int fdTemp = mkstemp((char *)path.mb_str());
+    if ( fdTemp == -1 )
+    {
+        // this might be not necessary as mkstemp() on most systems should have
+        // already done it but it doesn't hurt neither...
+        path.clear();
+    }
+    else // mkstemp() succeeded
+    {
+        // avoid leaking the fd
+        if ( fileTemp )
+        {
+            fileTemp->Attach(fdTemp);
+        }
+        else
+        {
+            close(fdTemp);
+        }

     }
     }

+#else // !HAVE_MKSTEMP
+
+#ifdef HAVE_MKTEMP
+    // same as above
+    path += _T("XXXXXX");
+
+    if ( !mktemp((char *)path.mb_str()) )
+    {
+        path.clear();
+    }
+#else // !HAVE_MKTEMP (includes __DOS__)
+    // generate the unique file name ourselves
+    #ifndef __DOS__
+    path << (unsigned int)getpid();
+    #endif
+
+    wxString pathTry;
+
+    static const size_t numTries = 1000;
+    for ( size_t n = 0; n < numTries; n++ )
+    {
+        // 3 hex digits is enough for numTries == 1000 < 4096
+        pathTry = path + wxString::Format(_T("%.03x"), n);
+        if ( !wxFile::Exists(pathTry) )
+        {
+            break;
+        }
+
+        pathTry.clear();
+    }
+
+    path = pathTry;
+#endif // HAVE_MKTEMP/!HAVE_MKTEMP
+
+    if ( !path.empty() )
+    {
+    }
+#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP
+
+#endif // Windows/!Windows
+
+    if ( path.empty() )
+    {
+        wxLogSysError(_("Failed to create a temporary file name"));
+    }
+    else if ( fileTemp && !fileTemp->IsOpened() )
+    {
+        // open the file - of course, there is a race condition here, this is
+        // why we always prefer using mkstemp()...
+        //
+        // NB: GetTempFileName() under Windows creates the file, so using
+        //     write_excl there would fail
+        if ( !fileTemp->Open(path,
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+                             wxFile::write,
+#else
+                             wxFile::write_excl,
+#endif
+                             wxS_IRUSR | wxS_IWUSR) )
+        {
+            // FIXME: If !ok here should we loop and try again with another
+            //        file name?  That is the standard recourse if open(O_EXCL)
+            //        fails, though of course it should be protected against
+            //        possible infinite looping too.
+
+            wxLogError(_("Failed to open temporary file."));
+
+            path.clear();
+        }
+    }
+
+    return path;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -274,12 +745,33 @@ bool wxFileName::Normalize(wxPathNormalize flags,
     format = GetFormat(format);
 
     // make the path absolute
     format = GetFormat(format);
 
     // make the path absolute

-    if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() )
+    if ( (flags & wxPATH_NORM_ABSOLUTE) && m_relative )

     {
         if ( cwd.empty() )
     {
         if ( cwd.empty() )

-            curDir.AssignCwd();
-        else
+        {
+            curDir.AssignCwd(GetVolume());
+        }
+        else // cwd provided
+        {

             curDir.AssignDir(cwd);
             curDir.AssignDir(cwd);

+        }
+
+#if 0
+        // 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
+        // but just set the current volume
+        if ( !HasVolume() && curDir.HasVolume() )
+        {
+            SetVolume(curDir.GetVolume());
+
+            if ( IsAbsolute() )
+            {
+                // yes, it was the case - we don't need curDir then
+                curDir.Clear();
+            }
+        }
+#endif
+        m_relative = FALSE;

     }
 
     // handle ~ stuff under Unix only
     }
 
     // handle ~ stuff under Unix only


@@ -297,6 +789,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
         }
     }
 
         }
     }
 

+    // transform relative path into abs one

     if ( curDir.IsOk() )
     {
         wxArrayString dirsNew = curDir.GetDirs();
     if ( curDir.IsOk() )
     {
         wxArrayString dirsNew = curDir.GetDirs();


@@ -316,7 +809,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
     {
         wxString dir = dirs[n];
 
     {
         wxString dir = dirs[n];
 

-        if ( flags && wxPATH_NORM_DOTS )
+        if ( flags & wxPATH_NORM_DOTS )

         {
             if ( dir == wxT(".") )
             {
         {
             if ( dir == wxT(".") )
             {


@@ -333,7 +826,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
                     return FALSE;
                 }
 
                     return FALSE;
                 }
 

-                m_dirs.Remove(m_dirs.GetCount() - 1);
+                m_dirs.RemoveAt(m_dirs.GetCount() - 1);

                 continue;
             }
         }
                 continue;
             }
         }


@@ -359,21 +852,63 @@ bool wxFileName::Normalize(wxPathNormalize flags,
         m_ext.MakeLower();
     }
 
         m_ext.MakeLower();
     }
 

-#if defined(__WXMSW__) && defined(__WIN32__)
-    if (flags & wxPATH_NORM_LONG)
+#if defined(__WIN32__)
+    if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) )

     {
         Assign(GetLongPath());
     }
     {
         Assign(GetLongPath());
     }

-#endif
+#endif // Win32

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

+bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
+{
+    wxFileName fnBase(pathBase, format);
+
+    // get cwd only once - small time saving
+    wxString cwd = wxGetCwd();
+    Normalize(wxPATH_NORM_ALL, cwd, format);
+    fnBase.Normalize(wxPATH_NORM_ALL, cwd, format);
+
+    bool withCase = IsCaseSensitive(format);
+
+    // we can't do anything if the files live on different volumes
+    if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) )
+    {
+        // nothing done
+        return FALSE;
+    }
+
+    // same drive, so we don't need our volume
+    m_volume.clear();
+
+    // remove common directories starting at the top
+    while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() &&
+                m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) )
+    {
+        m_dirs.RemoveAt(0);
+        fnBase.m_dirs.RemoveAt(0);
+    }
+
+    // add as many ".." as needed
+    size_t count = fnBase.m_dirs.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        m_dirs.Insert(wxT(".."), 0u);
+    }
+
+    m_relative = TRUE;
+
+    // we were modified
+    return TRUE;
+}
+

 // ----------------------------------------------------------------------------
 // filename kind tests
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // filename kind tests
 // ----------------------------------------------------------------------------
 

-bool wxFileName::SameAs( const wxFileName &filepath, wxPathFormat format)
+bool wxFileName::SameAs(const wxFileName &filepath, wxPathFormat format)

 {
     wxFileName fn1 = *this,
                fn2 = filepath;
 {
     wxFileName fn1 = *this,
                fn2 = filepath;


@@ -395,29 +930,23 @@ bool wxFileName::SameAs( const wxFileName &filepath, wxPathFormat format)
 /* static */
 bool wxFileName::IsCaseSensitive( wxPathFormat format )
 {
 /* static */
 bool wxFileName::IsCaseSensitive( wxPathFormat format )
 {

-    // only DOS filenames are case-sensitive
-    return GetFormat(format) != wxPATH_DOS;
+    // only Unix filenames are truely case-sensitive
+    return GetFormat(format) == wxPATH_UNIX;

 }
 
 }
 

-bool wxFileName::IsRelative( wxPathFormat format )
-{
-    return !IsAbsolute(format);
-}
-
-bool wxFileName::IsAbsolute( wxPathFormat format )
+/* static */
+wxString wxFileName::GetVolumeSeparator(wxPathFormat format)

 {
 {

-    wxChar ch = m_dirs.IsEmpty() ? _T('\0') : m_dirs[0u][0u];
+    wxString sepVol;

 
 

-    // Hack to cope with e.g. c:\thing - need something better
-    wxChar driveSep = _T('\0');
-    if (!m_dirs.IsEmpty() && m_dirs[0].Length() > 1)
-        driveSep = m_dirs[0u][1u];
+    if ( (GetFormat(format) == wxPATH_DOS) ||
+         (GetFormat(format) == wxPATH_VMS) )
+    {
+        sepVol = wxFILE_SEP_DSK;
+    }
+    //else: leave empty

 
 

-    // the path is absolute if it starts with a path separator or, only for
-    // Unix filenames, with "~" or "~user"
-    return IsPathSeparator(ch, format) ||
-           driveSep == _T(':') ||
-           (GetFormat(format) == wxPATH_UNIX && ch == _T('~') );
+    return sepVol;

 }
 
 /* static */
 }
 
 /* static */


@@ -427,8 +956,9 @@ wxString wxFileName::GetPathSeparators(wxPathFormat format)
     switch ( GetFormat(format) )
     {
         case wxPATH_DOS:
     switch ( GetFormat(format) )
     {
         case wxPATH_DOS:

-            // accept both as native APIs do
-            seps << wxFILE_SEP_PATH_UNIX << wxFILE_SEP_PATH_DOS;
+            // accept both as native APIs do but put the native one first as
+            // this is the one we use in GetFullPath()
+            seps << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_UNIX;

             break;
 
         default:
             break;
 
         default:


@@ -442,6 +972,10 @@ wxString wxFileName::GetPathSeparators(wxPathFormat format)
         case wxPATH_MAC:
             seps = wxFILE_SEP_PATH_MAC;
             break;
         case wxPATH_MAC:
             seps = wxFILE_SEP_PATH_MAC;
             break;

+
+        case wxPATH_VMS:
+            seps = wxFILE_SEP_PATH_VMS;
+            break;

     }
 
     return seps;
     }
 
     return seps;


@@ -450,6 +984,10 @@ wxString wxFileName::GetPathSeparators(wxPathFormat format)
 /* static */
 bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
 {
 /* static */
 bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
 {

+    // wxString::Find() doesn't work as expected with NUL - it will always find
+    // it, so it is almost surely a bug if this function is called with NUL arg
+    wxASSERT_MSG( ch != _T('\0'), _T("shouldn't be called with NUL") );
+

     return GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
 }
 
     return GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
 }
 


@@ -457,6 +995,7 @@ bool wxFileName::IsWild( wxPathFormat format )
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")

+    (void)format;

     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 
     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 


@@ -508,27 +1047,191 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 {
     format = GetFormat( format );
 
 {
     format = GetFormat( format );
 

-    wxString ret;
-    size_t count = m_dirs.GetCount();
-    for ( size_t i = 0; i < count; i++ )
+    wxString fullpath;
+
+    // the leading character
+    if ( format == wxPATH_MAC && m_relative )
+    {
+         fullpath += wxFILE_SEP_PATH_MAC;
+    }
+    else if ( format == wxPATH_DOS )
+    {
+         if (!m_relative)
+             fullpath += wxFILE_SEP_PATH_DOS;
+    }
+    else if ( format == wxPATH_UNIX )

     {
     {

-        ret += m_dirs[i];
-        if ( add_separator || (i < count) )
-            ret += wxFILE_SEP_PATH;
+         if (!m_relative)
+             fullpath += wxFILE_SEP_PATH_UNIX;
+    }
+
+    // then concatenate all the path components using the path separator
+    size_t dirCount = m_dirs.GetCount();
+    if ( dirCount )
+    {
+        if ( format == wxPATH_VMS )
+        {
+            fullpath += wxT('[');
+        }
+
+
+        for ( size_t i = 0; i < dirCount; i++ )
+        {
+            // TODO: What to do with ".." under VMS
+
+            switch (format)
+            {
+                case wxPATH_MAC:
+                {
+                    if (m_dirs[i] == wxT("."))
+                        break;
+                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
+                         fullpath += m_dirs[i];
+                    fullpath += wxT(':');
+                    break;
+                }
+                case wxPATH_DOS:
+                {
+                    fullpath += m_dirs[i];
+                    fullpath += wxT('\\');
+                    break;
+                }
+                case wxPATH_UNIX:
+                {
+                    fullpath += m_dirs[i];
+                    fullpath += wxT('/');
+                    break;
+                }
+                case wxPATH_VMS:
+                {
+                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
+                        fullpath += m_dirs[i];
+                    if (i == dirCount-1)
+                        fullpath += wxT(']');
+                    else
+                        fullpath += wxT('.');
+                    break;
+                }
+                default:
+                {
+                    wxFAIL_MSG( wxT("error") );
+                }
+            }
+        }

     }
 
     }
 

-    return ret;
+
+
+    return fullpath;

 }
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
 }
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {

-    return GetPathWithSep() + GetFullName();
+    format = GetFormat(format);
+
+    wxString fullpath;
+
+    // first put the volume
+    if ( !m_volume.empty() )
+    {
+        {
+            // Special Windows UNC paths hack, part 2: undo what we did in
+            // SplitPath() and make an UNC path if we have a drive which is not a
+            // single letter (hopefully the network shares can't be one letter only
+            // although I didn't find any authoritative docs on this)
+            if ( format == wxPATH_DOS && m_volume.length() > 1 )
+            {
+                fullpath << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << m_volume;
+            }
+            else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
+            {
+                fullpath << m_volume << GetVolumeSeparator(format);
+            }
+            // else ignore
+        }
+    }
+
+    // the leading character
+    if ( format == wxPATH_MAC && m_relative )
+    {
+         fullpath += wxFILE_SEP_PATH_MAC;
+    }
+    else if ( format == wxPATH_DOS )
+    {
+         if (!m_relative)
+             fullpath += wxFILE_SEP_PATH_DOS;
+    }
+    else if ( format == wxPATH_UNIX )
+    {
+         if (!m_relative)
+             fullpath += wxFILE_SEP_PATH_UNIX;
+    }
+
+    // then concatenate all the path components using the path separator
+    size_t dirCount = m_dirs.GetCount();
+    if ( dirCount )
+    {
+        if ( format == wxPATH_VMS )
+        {
+            fullpath += wxT('[');
+        }
+
+
+        for ( size_t i = 0; i < dirCount; i++ )
+        {
+            // TODO: What to do with ".." under VMS
+
+            switch (format)
+            {
+                case wxPATH_MAC:
+                {
+                    if (m_dirs[i] == wxT("."))
+                        break;
+                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
+                         fullpath += m_dirs[i];
+                    fullpath += wxT(':');
+                    break;
+                }
+                case wxPATH_DOS:
+                {
+                    fullpath += m_dirs[i];
+                    fullpath += wxT('\\');
+                    break;
+                }
+                case wxPATH_UNIX:
+                {
+                    fullpath += m_dirs[i];
+                    fullpath += wxT('/');
+                    break;
+                }
+                case wxPATH_VMS:
+                {
+                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
+                        fullpath += m_dirs[i];
+                    if (i == dirCount-1)
+                        fullpath += wxT(']');
+                    else
+                        fullpath += wxT('.');
+                    break;
+                }
+                default:
+                {
+                    wxFAIL_MSG( wxT("error") );
+                }
+            }
+        }
+    }
+
+    // finally add the file name and extension
+    fullpath += GetFullName();
+
+    return fullpath;

 }
 
 // Return the short form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetShortPath() const
 {
 }
 
 // Return the short form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetShortPath() const
 {

-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)

     wxString path(GetFullPath());
     wxString pathOut;
     DWORD sz = ::GetShortPathName(path, NULL, 0);
     wxString path(GetFullPath());
     wxString pathOut;
     DWORD sz = ::GetShortPathName(path, NULL, 0);


@@ -545,8 +1248,8 @@ wxString wxFileName::GetShortPath() const
     }
     if (ok)
         return pathOut;
     }
     if (ok)
         return pathOut;

-    else
-        return path;
+
+    return path;

 #else
     return GetFullPath();
 #endif
 #else
     return GetFullPath();
 #endif


@@ -555,33 +1258,32 @@ wxString wxFileName::GetShortPath() const
 // Return the long form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetLongPath() const
 {
 // Return the long form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetLongPath() const
 {

-#if defined(__WXMSW__) && defined(__WIN32__)
-    wxString path(GetFullPath());
-    wxString pathOut;
+    wxString pathOut,
+             path = GetFullPath();
+
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)

     bool success = FALSE;
 
     bool success = FALSE;
 

-#if wxUSE_DYNLIB_CLASS
+    // VZ: this code was disabled, why?
+#if 0 // wxUSE_DYNAMIC_LOADER

     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;

-    static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;

 
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
 
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;

-
-        wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
-        if ( 0 ) // dllKernel )
+        wxDynamicLibrary dllKernel(_T("kernel32"));
+        if ( dllKernel.IsLoaded() )

         {
             // may succeed or fail depending on the Windows version
         {
             // may succeed or fail depending on the Windows version

+            static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;

 #ifdef _UNICODE
 #ifdef _UNICODE

-            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) dllKernel.GetSymbol(_T("GetLongPathNameW"));

 #else
 #else

-            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameA"));
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) dllKernel.GetSymbol(_T("GetLongPathNameA"));

 #endif
 
 #endif
 

-            wxDllLoader::UnloadLibrary(dllKernel);
-

             if ( s_pfnGetLongPathName )
             {
                 DWORD dwSize = (*s_pfnGetLongPathName)(path, NULL, 0);
             if ( s_pfnGetLongPathName )
             {
                 DWORD dwSize = (*s_pfnGetLongPathName)(path, NULL, 0);


@@ -609,8 +1311,7 @@ wxString wxFileName::GetLongPath() const
     }
     if (success)
         return pathOut;
     }
     if (success)
         return pathOut;

-#endif
-    // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNAMIC_LOADER

 
     if (!success)
     {
 
     if (!success)
     {


@@ -622,19 +1323,22 @@ wxString wxFileName::GetLongPath() const
         pathOut = wxEmptyString;
 
         wxArrayString dirs = GetDirs();
         pathOut = wxEmptyString;
 
         wxArrayString dirs = GetDirs();

-        dirs.Add(GetName());
+        dirs.Add(GetFullName());

 
 

-        size_t count = dirs.GetCount();
-        size_t i;

         wxString tmpPath;
 
         wxString tmpPath;
 

-        for ( i = 0; i < count; i++ )
+        size_t count = dirs.GetCount();
+        for ( size_t i = 0; i < count; i++ )

         {
         {

-            // We're using pathOut to collect the long-name path,
-            // but using a temporary for appending the last path component which may be short-name
+            // We're using pathOut to collect the long-name path, but using a
+            // temporary for appending the last path component which may be
+            // short-name

             tmpPath = pathOut + dirs[i];
 
             tmpPath = pathOut + dirs[i];
 

-            if (tmpPath.Last() == wxT(':'))
+            if ( tmpPath.empty() )
+                continue;
+
+            if ( tmpPath.Last() == wxT(':') )

             {
                 // Can't pass a drive and root dir to FindFirstFile,
                 // so continue to next dir
             {
                 // Can't pass a drive and root dir to FindFirstFile,
                 // so continue to next dir


@@ -649,30 +1353,31 @@ wxString wxFileName::GetLongPath() const
                 // Error: return immediately with the original path
                 return path;
             }
                 // Error: return immediately with the original path
                 return path;
             }

-            else
-            {
-                pathOut += findFileData.cFileName;
-                if ( (i < (count-1)) )
-                    pathOut += wxFILE_SEP_PATH;

 
 

-                ::FindClose(hFind);
-            }
+            pathOut += findFileData.cFileName;
+            if ( (i < (count-1)) )
+                pathOut += wxFILE_SEP_PATH;
+
+            ::FindClose(hFind);

         }
     }
         }
     }

+#else // !Win32
+    pathOut = path;
+#endif // Win32/!Win32
+

     return pathOut;
     return pathOut;

-#else
-    return GetFullPath();
-#endif

 }
 
 wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 {
     if (format == wxPATH_NATIVE)
     {
 }
 
 wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 {
     if (format == wxPATH_NATIVE)
     {

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__)

         format = wxPATH_DOS;
         format = wxPATH_DOS;

-#elif defined(__WXMAC__)
-        format = wxPATH_UNIX; // that's the way the rest of wx' code works right now
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+        format = wxPATH_MAC;
+#elif defined(__VMS)
+        format = wxPATH_VMS;

 #else
         format = wxPATH_UNIX;
 #endif
 #else
         format = wxPATH_UNIX;
 #endif


@@ -684,7 +1389,9 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 // path splitting function
 // ----------------------------------------------------------------------------
 
 // path splitting function
 // ----------------------------------------------------------------------------
 

-void wxFileName::SplitPath(const wxString& fullpath,
+/* static */
+void wxFileName::SplitPath(const wxString& fullpathWithVolume,
+                           wxString *pstrVolume,

                            wxString *pstrPath,
                            wxString *pstrName,
                            wxString *pstrExt,
                            wxString *pstrPath,
                            wxString *pstrName,
                            wxString *pstrExt,


@@ -692,18 +1399,64 @@ void wxFileName::SplitPath(const wxString& fullpath,
 {
     format = GetFormat(format);
 
 {
     format = GetFormat(format);
 

+    wxString fullpath = fullpathWithVolume;
+
+    // under VMS the end of the path is ']', not the path separator used to
+    // separate the components
+    wxString sepPath = format == wxPATH_VMS ? wxString(_T(']'))
+                                            : GetPathSeparators(format);
+
+    // special Windows UNC paths hack: transform \\share\path into share:path
+    if ( format == wxPATH_DOS )
+    {
+        if ( fullpath.length() >= 4 &&
+                fullpath[0u] == wxFILE_SEP_PATH_DOS &&
+                    fullpath[1u] == wxFILE_SEP_PATH_DOS )
+        {
+            fullpath.erase(0, 2);
+
+            size_t posFirstSlash = fullpath.find_first_of(sepPath);
+            if ( posFirstSlash != wxString::npos )
+            {
+                fullpath[posFirstSlash] = wxFILE_SEP_DSK;
+
+                // UNC paths are always absolute, right? (FIXME)
+                fullpath.insert(posFirstSlash + 1, wxFILE_SEP_PATH_DOS);
+            }
+        }
+    }
+
+    // We separate the volume here
+    if ( format == wxPATH_DOS || format == wxPATH_VMS )
+    {
+        wxString sepVol = GetVolumeSeparator(format);
+
+        size_t posFirstColon = fullpath.find_first_of(sepVol);
+        if ( posFirstColon != wxString::npos )
+        {
+            if ( pstrVolume )
+            {
+                *pstrVolume = fullpath.Left(posFirstColon);
+            }
+
+            // remove the volume name and the separator from the full path
+            fullpath.erase(0, posFirstColon + sepVol.length());
+        }
+    }
+

     // find the positions of the last dot and last path separator in the path
     size_t posLastDot = fullpath.find_last_of(wxFILE_SEP_EXT);
     // find the positions of the last dot and last path separator in the path
     size_t posLastDot = fullpath.find_last_of(wxFILE_SEP_EXT);

-    size_t posLastSlash = fullpath.find_last_of(GetPathSeparators(format));
+    size_t posLastSlash = fullpath.find_last_of(sepPath);

 
 

-    if ( (posLastDot != wxString::npos) && (format == wxPATH_UNIX) )
+    if ( (posLastDot != wxString::npos) &&
+            ((format == wxPATH_UNIX) || (format == wxPATH_VMS)) )

     {
         if ( (posLastDot == 0) ||
     {
         if ( (posLastDot == 0) ||

-             (fullpath[posLastDot - 1] == wxFILE_SEP_PATH_UNIX) )
+             (fullpath[posLastDot - 1] == sepPath[0u] ) )

         {
         {

-            // under Unix, dot may be (and commonly is) the first character of
-            // the filename, don't treat the entire filename as extension in
-            // this case
+            // under Unix and VMS, dot may be (and commonly is) the first
+            // character of the filename, don't treat the entire filename as
+            // extension in this case

             posLastDot = wxString::npos;
         }
     }
             posLastDot = wxString::npos;
         }
     }


@@ -727,8 +1480,21 @@ void wxFileName::SplitPath(const wxString& fullpath,
         }
         else
         {
         }
         else
         {

-            // take all until the separator
-            *pstrPath = fullpath.Left(posLastSlash);
+            // take everything up to the path separator but take care to make
+            // the path equal to something like '/', not empty, for the files
+            // immediately under root directory
+            size_t len = posLastSlash;
+            if ( !len )
+                len++;
+
+            *pstrPath = fullpath.Left(len);
+
+            // special VMS hack: remove the initial bracket
+            if ( format == wxPATH_VMS )
+            {
+                if ( (*pstrPath)[0u] == _T('[') )
+                    pstrPath->erase(0, 1);
+            }

         }
     }
 
         }
     }
 


@@ -769,3 +1535,140 @@ void wxFileName::SplitPath(const wxString& fullpath,
         }
     }
 }
         }
     }
 }

+
+/* 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
+// ----------------------------------------------------------------------------
+
+bool wxFileName::SetTimes(const wxDateTime *dtCreate,
+                          const wxDateTime *dtAccess,
+                          const wxDateTime *dtMod)
+{
+#if defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__))
+    if ( !dtAccess && !dtMod )
+    {
+        // can't modify the creation time anyhow, don't try
+        return TRUE;
+    }
+
+    // if dtAccess or dtMod is not specified, use the other one (which must be
+    // non NULL because of the test above) for both times
+    utimbuf utm;
+    utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks();
+    utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks();
+    if ( utime(GetFullPath(), &utm) == 0 )
+    {
+        return TRUE;
+    }
+#elif defined(__WIN32__)
+    wxFileHandle fh(GetFullPath());
+    if ( fh.IsOk() )
+    {
+        FILETIME ftAccess, ftCreate, ftWrite;
+
+        if ( dtCreate )
+            ConvertWxToFileTime(&ftCreate, *dtCreate);
+        if ( dtAccess )
+            ConvertWxToFileTime(&ftAccess, *dtAccess);
+        if ( dtMod )
+            ConvertWxToFileTime(&ftWrite, *dtMod);
+
+        if ( ::SetFileTime(fh,
+                           dtCreate ? &ftCreate : NULL,
+                           dtAccess ? &ftAccess : NULL,
+                           dtMod ? &ftWrite : NULL) )
+        {
+            return TRUE;
+        }
+    }
+#else // other platform
+#endif // platforms
+
+    wxLogSysError(_("Failed to modify file times for '%s'"),
+                  GetFullPath().c_str());
+
+    return FALSE;
+}
+
+bool wxFileName::Touch()
+{
+#if defined(__UNIX_LIKE__)
+    // under Unix touching file is simple: just pass NULL to utime()
+    if ( utime(GetFullPath(), NULL) == 0 )
+    {
+        return TRUE;
+    }
+
+    wxLogSysError(_("Failed to touch the file '%s'"), GetFullPath().c_str());
+
+    return FALSE;
+#else // other platform
+    wxDateTime dtNow = wxDateTime::Now();
+
+    return SetTimes(NULL /* don't change create time */, &dtNow, &dtNow);
+#endif // platforms
+}
+
+bool wxFileName::GetTimes(wxDateTime *dtAccess,
+                          wxDateTime *dtMod,
+                          wxDateTime *dtChange) const
+{
+#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__))
+    wxStructStat stBuf;
+    if ( wxStat(GetFullPath(), &stBuf) == 0 )
+    {
+        if ( dtAccess )
+            dtAccess->Set(stBuf.st_atime);
+        if ( dtMod )
+            dtMod->Set(stBuf.st_mtime);
+        if ( dtChange )
+            dtChange->Set(stBuf.st_ctime);
+
+        return TRUE;
+    }
+#elif defined(__WIN32__)
+    wxFileHandle fh(GetFullPath());
+    if ( fh.IsOk() )
+    {
+        FILETIME ftAccess, ftCreate, ftWrite;
+
+        if ( ::GetFileTime(fh,
+                           dtMod ? &ftCreate : NULL,
+                           dtAccess ? &ftAccess : NULL,
+                           dtChange ? &ftWrite : NULL) )
+        {
+            if ( dtMod )
+                ConvertFileTimeToWx(dtMod, ftCreate);
+            if ( dtAccess )
+                ConvertFileTimeToWx(dtAccess, ftAccess);
+            if ( dtChange )
+                ConvertFileTimeToWx(dtChange, ftWrite);
+
+            return TRUE;
+        }
+    }
+#else // other platform
+#endif // platforms
+
+    wxLogSysError(_("Failed to retrieve file times for '%s'"),
+                  GetFullPath().c_str());
+
+    return FALSE;
+}
+