linking fixes

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 7b5c48418dd7c927dfab7a68da4c84d68434cc54..aad2543db419971a8a13755a6a396fc417ee3af7 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -37,7 +37,10 @@
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"

+
+#if wxUSE_DYNLIB_CLASS

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

+#endif

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


@@ -149,6 +152,13 @@ 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
 // ----------------------------------------------------------------------------


@@ -201,14 +211,47 @@ void wxFileName::AssignTempFileName( const wxString &prefix )
 // directory operations
 // ----------------------------------------------------------------------------
 
 // 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()
 }
 
 bool wxFileName::Rmdir()


@@ -421,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 "[...]")
 {
     // 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;
 }
 


@@ -486,6 +530,7 @@ 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();
 }
 
     return GetPathWithSep() + GetFullName();
 }
 


@@ -524,20 +569,25 @@ wxString wxFileName::GetLongPath() const
     wxString pathOut;
     bool success = FALSE;
 
     wxString pathOut;
     bool success = FALSE;
 

+#if 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;

-    static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;

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

-
+#if 0

         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {
             // may succeed or fail depending on the Windows version
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {
             // may succeed or fail depending on the Windows version

-            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathName"));
+                       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);
 
 
             wxDllLoader::UnloadLibrary(dllKernel);
 


@@ -565,9 +615,12 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
                 }
             }
         }

+#endif         

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

+#endif
+    // wxUSE_DYNLIB_CLASS

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


@@ -578,17 +631,27 @@ wxString wxFileName::GetLongPath() const
         HANDLE hFind;
         pathOut = wxEmptyString;
 
         HANDLE hFind;
         pathOut = wxEmptyString;
 

-        size_t count = m_dirs.GetCount();
+        wxArrayString dirs = GetDirs();
+        dirs.Add(GetName());
+
+        size_t count = dirs.GetCount();

         size_t i;
         wxString tmpPath;
         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
         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 + m_dirs[i];
+            tmpPath = pathOut + dirs[i];

 
             if (tmpPath.Last() == wxT(':'))
 
             if (tmpPath.Last() == wxT(':'))

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

                 tmpPath += wxFILE_SEP_PATH;
                 tmpPath += wxFILE_SEP_PATH;

+                pathOut = tmpPath;
+                continue;
+            }

 
             hFind = ::FindFirstFile(tmpPath, &findFileData);
             if (hFind == INVALID_HANDLE_VALUE)
 
             hFind = ::FindFirstFile(tmpPath, &findFileData);
             if (hFind == INVALID_HANDLE_VALUE)


@@ -599,7 +662,7 @@ wxString wxFileName::GetLongPath() const
             else
             {
                 pathOut += findFileData.cFileName;
             else
             {
                 pathOut += findFileData.cFileName;

-                if ( (i < count) )
+                if ( (i < (count-1)) )

                     pathOut += wxFILE_SEP_PATH;
 
                 ::FindClose(hFind);
                     pathOut += wxFILE_SEP_PATH;
 
                 ::FindClose(hFind);