applied patch 475879 (Can't use subclassed GridCellEditor)

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index aad2543db419971a8a13755a6a396fc417ee3af7..38f20fee49fd8de3840fbf243ddf0d65607349b3 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -39,15 +39,117 @@
 #include "wx/utils.h"
 
 #if wxUSE_DYNLIB_CLASS
 #include "wx/utils.h"
 
 #if wxUSE_DYNLIB_CLASS

-#include "wx/dynlib.h"
+    #include "wx/dynlib.h"

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

-#include <windows.h>
-#include "wx/msw/winundef.h"
+    #include <windows.h>
+
+    #include "wx/msw/winundef.h"
+#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
 
 #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
+#ifdef __WIN32__
+
+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
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+// 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
 // ============================================================================


@@ -70,18 +172,18 @@ void wxFileName::Assign( const wxString& path,
 {
     wxStringTokenizer tn(path, GetPathSeparators(format),
                          wxTOKEN_RET_EMPTY_ALL);
 {
     wxStringTokenizer tn(path, GetPathSeparators(format),
                          wxTOKEN_RET_EMPTY_ALL);

-    bool first = TRUE;
+    int i = 0;

     m_dirs.Clear();
     while ( tn.HasMoreTokens() )
     {
         wxString token = tn.GetNextToken();
 
     m_dirs.Clear();
     while ( tn.HasMoreTokens() )
     {
         wxString token = tn.GetNextToken();
 

-        // If the path starts with a slash, we need the first
-        // dir entry to be an empty for later reassembly.
-        if (first || !token.IsEmpty())
+        // If the path starts with a slash (or two for a network path),
+        // we need the first dir entry to be an empty for later reassembly.
+        if ((i < 2) || !token.IsEmpty())

             m_dirs.Add( token );
 
             m_dirs.Add( token );
 

-        first = FALSE;
+        i ++;

     }
 
     m_ext = ext;
     }
 
     m_ext = ext;


@@ -152,13 +254,6 @@ bool wxFileName::DirExists( const wxString &dir )
     return ::wxDirExists( dir );
 }
 
     return ::wxDirExists( dir );
 }
 

-wxDateTime wxFileName::GetModificationTime()
-{
-    wxDateTime ret( wxFileModificationTime( GetFullPath() ) );
-
-    return ret;
-}
-

 // ----------------------------------------------------------------------------
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------


@@ -530,14 +625,50 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {

-       (void)format;
-    return GetPathWithSep() + GetFullName();
+    format = GetFormat( format );
+    
+    wxString ret;
+    if (format == wxPATH_DOS)
+    {
+        for (size_t i = 0; i < m_dirs.GetCount(); i++)
+        {
+            ret += m_dirs[i];
+            ret += '\\';
+        }
+    }
+    else
+    if (format == wxPATH_UNIX)
+    {
+        for (size_t i = 0; i < m_dirs.GetCount(); i++)
+        {
+            ret += m_dirs[i];
+            ret += '/';
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < m_dirs.GetCount(); i++)
+        {
+            ret += m_dirs[i];
+            ret += ':';
+        }
+    }
+    
+    ret += m_name;
+    
+    if (!m_ext.IsEmpty())
+    {
+        ret += '.';
+        ret += m_ext;
+    }
+    
+    return ret;

 }
 
 // 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);


@@ -554,8 +685,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


@@ -564,12 +695,13 @@ 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__)
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)

     wxString path(GetFullPath());
     wxString pathOut;
     bool success = FALSE;
 
     wxString path(GetFullPath());
     wxString pathOut;
     bool success = FALSE;
 

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

     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;


@@ -577,7 +709,6 @@ wxString wxFileName::GetLongPath() const
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;

-#if 0

         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {


@@ -615,12 +746,10 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
                 }
             }
         }

-#endif         

     }
     if (success)
         return pathOut;
     }
     if (success)
         return pathOut;

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

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


@@ -632,7 +761,7 @@ 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;
 
         size_t count = dirs.GetCount();
         size_t i;


@@ -669,6 +798,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
             }
         }
     }

+

     return pathOut;
 #else
     return GetFullPath();
     return pathOut;
 #else
     return GetFullPath();


@@ -681,8 +811,8 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         format = wxPATH_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         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; 

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


@@ -779,3 +909,124 @@ void wxFileName::SplitPath(const wxString& fullpath,
         }
     }
 }
         }
     }
 }

+
+// ----------------------------------------------------------------------------
+// time functions
+// ----------------------------------------------------------------------------
+
+bool wxFileName::SetTimes(const wxDateTime *dtCreate,
+                          const wxDateTime *dtAccess,
+                          const wxDateTime *dtMod)
+{
+#if defined(__UNIX_LIKE__)
+    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__)
+    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;
+}
+