test for wxLog interaction with wxYield better

[wxWidgets.git] / include / wx / filename.h

diff --git a/include/wx/filename.h b/include/wx/filename.h
index cf6cd1d18e74fb6a43d84019d1a7ae83c1babe05..06696bfdf207932e87250c73f16abc329a8a32b4 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -36,6 +36,7 @@
 
 // ridiculously enough, this will replace DirExists with wxDirExists etc
 #include "wx/filefn.h"
 
 // ridiculously enough, this will replace DirExists with wxDirExists etc
 #include "wx/filefn.h"

+#include "wx/datetime.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -101,14 +102,6 @@ public:
                wxPathFormat format = wxPATH_NATIVE)
         { Assign(path, name, ext, format); }
 
                wxPathFormat format = wxPATH_NATIVE)
         { Assign(path, name, ext, format); }
 

-        // assorted assignment operators
-
-    wxFileName& operator=(const wxFileName& filename)
-        { Assign(filename); return *this; }
-
-    wxFileName& operator=(const wxString& filename)
-        { Assign(filename); return *this; }
-

         // the same for delayed initialization
 
         // VZ: wouldn't it be better to call this Create() for consistency with
         // the same for delayed initialization
 
         // VZ: wouldn't it be better to call this Create() for consistency with


@@ -127,6 +120,14 @@ public:
     void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
         { Assign(dir, _T(""), format); }
 
     void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
         { Assign(dir, _T(""), format); }
 

+        // assorted assignment operators
+
+    wxFileName& operator=(const wxFileName& filename)
+        { Assign(filename); return *this; }
+
+    wxFileName& operator=(const wxString& filename)
+        { Assign(filename); return *this; }
+

         // reset all components to default, uninitialized state
     void Clear();
 
         // reset all components to default, uninitialized state
     void Clear();
 


@@ -147,6 +148,9 @@ public:
     bool DirExists();
     static bool DirExists( const wxString &dir );
 
     bool DirExists();
     static bool DirExists( const wxString &dir );
 

+        // Well, get modification time with sec resolution
+    wxDateTime GetModificationTime();
+    

         // VZ: also need: IsDirWritable(), IsFileExecutable() &c (TODO)
 
     // various file/dir operations
         // VZ: also need: IsDirWritable(), IsFileExecutable() &c (TODO)
 
     // various file/dir operations


@@ -187,15 +191,15 @@ public:
 
     // Comparison
 
 
     // Comparison
 

+        // compares with the rules of this platform
+    bool SameAs(const wxFileName &filepath,
+                wxPathFormat format = wxPATH_NATIVE);
+

         // uses the current platform settings
     bool operator==(const wxFileName& filename) { return SameAs(filename); }
     bool operator==(const wxString& filename)
         { return *this == wxFileName(filename); }
 
         // uses the current platform settings
     bool operator==(const wxFileName& filename) { return SameAs(filename); }
     bool operator==(const wxString& filename)
         { return *this == wxFileName(filename); }
 

-        // compares with the rules of this platform
-    bool SameAs(const wxFileName &filepath,
-                wxPathFormat format = wxPATH_NATIVE);
-

     // Tests
     static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
     bool IsRelative( wxPathFormat format = wxPATH_NATIVE );
     // Tests
     static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
     bool IsRelative( wxPathFormat format = wxPATH_NATIVE );