Small fixes to defs.h; change "windows.h" to <windows.h> in filefn.cpp

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 2753984d3e3842333b0585d2988c13ed52095fbf..da754cfe8aab5f6ff4faf994fd2c92e333731604 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -16,12 +16,19 @@
 
 #include "wx/setup.h"
 
-#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if !wxUSE_STREAMS
+#error You cannot compile virtual file systems without wxUSE_STREAMS
+#endif
+
+#if wxUSE_HTML && !wxUSE_FILESYSTEM
+#error You cannot compile wxHTML without virtual file systems
+#endif
+
+#if wxUSE_FILESYSTEM
 
 #include "wx/stream.h"
-#include "wx/mimetype.h"
 #include "wx/url.h"
-
+#include "wx/datetime.h"
 
 class wxFSFile;
 class wxFileSystemHandler;
@@ -41,14 +48,18 @@ class WXDLLEXPORT wxFSFile : public wxObject
         wxString m_Location;
         wxString m_MimeType;
         wxString m_Anchor;
+        wxDateTime m_Modif;
 
     public:
-        wxFSFile(wxInputStream *stream, const wxString& loc, const wxString& mimetype, const wxString& anchor)
+        wxFSFile(wxInputStream *stream, const wxString& loc, 
+                 const wxString& mimetype, const wxString& anchor,
+                 wxDateTime modif)
             {
                 m_Stream = stream;
                 m_Location = loc;
                 m_MimeType = mimetype; m_MimeType.MakeLower();
                 m_Anchor = anchor;
+                m_Modif = modif;
             }
         virtual ~wxFSFile()
             {
@@ -66,6 +77,8 @@ class WXDLLEXPORT wxFSFile : public wxObject
                 // returns the original location (aka filename) of the file
 
         const wxString& GetAnchor() const {return m_Anchor;}
+        
+        wxDateTime GetModificationTime() const {return m_Modif;}
 };
 
 
@@ -122,17 +135,6 @@ class WXDLLEXPORT wxFileSystemHandler : public wxObject
         wxString GetMimeTypeFromExt(const wxString& location);
                 // Returns MIME type of the file - w/o need to open it
                 // (default behaviour is that it returns type based on extension)
-
-    public:
-        static void CleanUpStatics();
-               // deletes static members (m_MimeMng). It can be called
-               // as many times as you wish because m_MimeMng is created
-               // on demand
-
-    private:
-        static wxMimeTypesManager *m_MimeMng;
-                // MIME manager
-                // (it's static and thus shared by all instances and derived classes)
 };
 
 
@@ -159,7 +161,7 @@ class WXDLLEXPORT wxFileSystem : public wxObject
                 // file contained in this directory
                 // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")
 
-           wxString GetPath() const {return m_Path;}
+        wxString GetPath() const {return m_Path;}
 
         wxFSFile* OpenFile(const wxString& location);
                 // opens given file and returns pointer to input stream.
@@ -221,7 +223,7 @@ special characters :
 */
 
 #endif
-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM
 
 #endif
   // __FILESYS_H__