applied patch 432814: saving BMP in 1, 4 and 8 bpp

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 342bdb88e288bbf0fda86110f4349c3361b4c415..b9679a11a3a1326331db2c74a3ac4aaeb7ba8a25 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -152,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
 // ----------------------------------------------------------------------------


@@ -204,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()


@@ -424,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;
 }
 


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

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


@@ -512,8 +590,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


@@ -522,25 +600,25 @@ 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;

-    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"));
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));

-        if ( 0 ) // dllKernel )
+        if ( dllKernel )

         {
             // 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
             s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
 #else
 #ifdef _UNICODE
             s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
 #else


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

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

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


@@ -588,7 +665,10 @@ wxString wxFileName::GetLongPath() const
         HANDLE hFind;
         pathOut = wxEmptyString;
 
         HANDLE hFind;
         pathOut = wxEmptyString;
 

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

         size_t i;
         wxString tmpPath;
 
         size_t i;
         wxString tmpPath;
 


@@ -596,7 +676,7 @@ wxString wxFileName::GetLongPath() const
         {
             // 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 + m_dirs[i];
+            tmpPath = pathOut + dirs[i];

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


@@ -623,6 +703,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
             }
         }
     }

+

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


@@ -636,7 +717,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 #if defined(__WXMSW__) || defined(__WXPM__)
         format = wxPATH_DOS;
 #elif defined(__WXMAC__)
 #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
+        format = wxPATH_MAC; 

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