Fixed Unicode breakage I caused

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index db586b2f6a783e7f33f89de2b82d739f8aaea22a..5d19924436441740c55ee88437b4d0a68d56a8bc 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -1220,7 +1220,7 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
         }
     }
 
-    if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() && fullpath.Last() != wxFILE_SEP_PATH)
+    if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() && fullpath.Last() != GetPathSeparator(format))
     {
         fullpath += GetPathSeparator(format);
     }
@@ -1663,16 +1663,16 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess,
         FILETIME ftAccess, ftCreate, ftWrite;
 
         if ( ::GetFileTime(fh,
-                           dtMod ? &ftCreate : NULL,
+                           dtCreate ? &ftCreate : NULL,
                            dtAccess ? &ftAccess : NULL,
-                           dtCreate ? &ftWrite : NULL) )
+                           dtMod ? &ftWrite : NULL) )
         {
-            if ( dtMod )
-                ConvertFileTimeToWx(dtMod, ftCreate);
+            if ( dtCreate )
+                ConvertFileTimeToWx(dtCreate, ftCreate);
             if ( dtAccess )
                 ConvertFileTimeToWx(dtAccess, ftAccess);
-            if ( dtCreate )
-                ConvertFileTimeToWx(dtCreate, ftWrite);
+            if ( dtMod )
+                ConvertFileTimeToWx(dtMod, ftWrite);
 
             return TRUE;
         }