wxControl and wxDialog coded and supporting module def file.

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 610a7c2993a5abd10055329c2ffb7e42a8f5d251..041e24a1f45c0b24afe6f02f6a6f71a689208fab 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -48,6 +48,19 @@
 #include "wx/msw/winundef.h"
 #endif
 
 #include "wx/msw/winundef.h"
 #endif
 

+// at least some of these are required for file mod time
+#ifdef __WXGTK__
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <pwd.h>
+#ifndef __VMS
+# include <grp.h>
+#endif
+# include <time.h>
+#include <unistd.h>
+#endif
+

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


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

+wxDateTime wxFileName::GetModificationTime()
+{
+#ifdef __WXGTK__
+    struct stat buff;
+    stat( GetFullName().fn_str(), &buff );
+
+#if !defined( __EMX__ ) && !defined(__VMS)
+    struct stat lbuff;
+    lstat( GetFullName().fn_str(), &lbuff );
+    struct tm *t = localtime( &lbuff.st_mtime );
+#else
+    struct tm *t = localtime( &buff.st_mtime );
+#endif
+
+    wxDateTime ret( t->tm_mday, (wxDateTime::Month)t->tm_mon, t->tm_year+1900, t->tm_hour, t->tm_min, t->tm_sec );
+#else
+    
+    wxDateTime ret = wxDateTime::Now();
+
+#endif
+    return ret;
+}
+

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


@@ -215,6 +251,7 @@ bool wxFileName::Mkdir( const wxString &dir, int perm, bool full )
     {
         wxFileName filename(dir);
         wxArrayString dirs = filename.GetDirs();
     {
         wxFileName filename(dir);
         wxArrayString dirs = filename.GetDirs();

+        dirs.Add(filename.GetName());

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


@@ -620,7 +657,10 @@ 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;
 


@@ -628,7 +668,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(':'))
             {