wxDbGrid additions

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 5e4f6beaada7a7ec019096310e131be50c3d238d..aad2543db419971a8a13755a6a396fc417ee3af7 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -38,6 +38,10 @@
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 
+#if wxUSE_DYNLIB_CLASS
+#include "wx/dynlib.h"
+#endif
+
 // For GetShort/LongPathName
 #ifdef __WIN32__
 #include <windows.h>
@@ -148,6 +152,13 @@ bool wxFileName::DirExists( const wxString &dir )
     return ::wxDirExists( dir );
 }
 
+wxDateTime wxFileName::GetModificationTime()
+{
+    wxDateTime ret( wxFileModificationTime( GetFullPath() ) );
+
+    return ret;
+}
+
 // ----------------------------------------------------------------------------
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------
@@ -200,14 +211,47 @@ void wxFileName::AssignTempFileName( const wxString &prefix )
 // directory operations
 // ----------------------------------------------------------------------------
 
-bool wxFileName::Mkdir( int perm )
+bool wxFileName::Mkdir( int perm, bool full )
 {
-    return wxFileName::Mkdir( GetFullPath(), perm );
+    return wxFileName::Mkdir( GetFullPath(), perm, full );
 }
 
-bool wxFileName::Mkdir( const wxString &dir, int perm )
+bool wxFileName::Mkdir( const wxString &dir, int perm, bool full )
 {
-    return ::wxMkdir( dir, perm );
+    if (full)
+    {
+        wxFileName filename(dir);
+        wxArrayString dirs = filename.GetDirs();
+        dirs.Add(filename.GetName());
+
+        size_t count = dirs.GetCount();
+        size_t i;
+        wxString currPath;
+        int noErrors = 0;
+        for ( i = 0; i < count; i++ )
+        {
+            currPath += dirs[i];
+
+            if (currPath.Last() == wxT(':'))
+            {
+                // Can't create a root directory so continue to next dir
+                currPath += wxFILE_SEP_PATH;
+                continue;
+            }
+
+            if (!DirExists(currPath))
+                if (!wxMkdir(currPath, perm))
+                    noErrors ++;
+
+            if ( (i < (count-1)) )
+                currPath += wxFILE_SEP_PATH;
+        }
+
+        return (noErrors == 0);
+
+    }
+    else
+        return ::wxMkdir( dir, perm );
 }
 
 bool wxFileName::Rmdir()
@@ -420,6 +464,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 "[...]")
+       (void)format;
     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 
@@ -485,6 +530,7 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
+       (void)format;
     return GetPathWithSep() + GetFullName();
 }
 
@@ -521,22 +567,109 @@ wxString wxFileName::GetLongPath() const
 #if defined(__WXMSW__) && defined(__WIN32__)
     wxString path(GetFullPath());
     wxString pathOut;
-    DWORD sz = ::GetLongPathName(path, NULL, 0);
-    bool ok = sz != 0;
-    if ( ok )
+    bool success = FALSE;
+
+#if wxUSE_DYNLIB_CLASS
+    typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
+
+    static bool s_triedToLoad = FALSE;
+
+    if ( !s_triedToLoad )
     {
-        ok = ::GetLongPathName
-               (
-                path,
-                pathOut.GetWriteBuf(sz),
-                sz
-               ) != 0;
-        pathOut.UngetWriteBuf();
+        s_triedToLoad = TRUE;
+#if 0
+        wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
+        if ( dllKernel )
+        {
+            // may succeed or fail depending on the Windows version
+                       static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
+#ifdef _UNICODE
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
+#else
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameA"));
+#endif
+
+            wxDllLoader::UnloadLibrary(dllKernel);
+
+            if ( s_pfnGetLongPathName )
+            {
+                DWORD dwSize = (*s_pfnGetLongPathName)(path, NULL, 0);
+                bool ok = dwSize > 0;
+
+                if ( ok )
+                {
+                    DWORD sz = (*s_pfnGetLongPathName)(path, NULL, 0);
+                    ok = sz != 0;
+                    if ( ok )
+                    {
+                        ok = (*s_pfnGetLongPathName)
+                                (
+                                path,
+                                pathOut.GetWriteBuf(sz),
+                                sz
+                                ) != 0;
+                        pathOut.UngetWriteBuf();
+
+                        success = TRUE;
+                    }
+                }
+            }
+        }
+#endif         
     }
-    if (ok)
+    if (success)
         return pathOut;
-    else
-        return path;
+#endif
+    // wxUSE_DYNLIB_CLASS
+
+    if (!success)
+    {
+        // The OS didn't support GetLongPathName, or some other error.
+        // We need to call FindFirstFile on each component in turn.
+
+        WIN32_FIND_DATA findFileData;
+        HANDLE hFind;
+        pathOut = wxEmptyString;
+
+        wxArrayString dirs = GetDirs();
+        dirs.Add(GetName());
+
+        size_t count = dirs.GetCount();
+        size_t i;
+        wxString tmpPath;
+
+        for ( 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
+            tmpPath = pathOut + dirs[i];
+
+            if (tmpPath.Last() == wxT(':'))
+            {
+                // Can't pass a drive and root dir to FindFirstFile,
+                // so continue to next dir
+                tmpPath += wxFILE_SEP_PATH;
+                pathOut = tmpPath;
+                continue;
+            }
+
+            hFind = ::FindFirstFile(tmpPath, &findFileData);
+            if (hFind == INVALID_HANDLE_VALUE)
+            {
+                // Error: return immediately with the original path
+                return path;
+            }
+            else
+            {
+                pathOut += findFileData.cFileName;
+                if ( (i < (count-1)) )
+                    pathOut += wxFILE_SEP_PATH;
+
+                ::FindClose(hFind);
+            }
+        }
+    }
+    return pathOut;
 #else
     return GetFullPath();
 #endif