ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index bda6d7c5dd341cc7e721bbcca723be951dc7320f..69d4ffd284b6cfc4f5e67e511dd969d861a4565d 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filesys.h
+// Name:        wx/filesys.h

 // Purpose:     class for opening files - virtual file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     class for opening files - virtual file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik


@@ -25,6 +25,7 @@
 #include "wx/stream.h"
 #include "wx/datetime.h"
 #include "wx/filename.h"
 #include "wx/stream.h"
 #include "wx/datetime.h"
 #include "wx/filename.h"

+#include "wx/hashmap.h"

 
 class WXDLLIMPEXP_BASE wxFSFile;
 class WXDLLIMPEXP_BASE wxFileSystemHandler;
 
 class WXDLLIMPEXP_BASE wxFSFile;
 class WXDLLIMPEXP_BASE wxFileSystemHandler;


@@ -48,7 +49,6 @@ public:
              )
     {
         m_Stream = stream;
              )
     {
         m_Stream = stream;

-        m_destroy = true;

         m_Location = loc;
         m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;
         m_Location = loc;
         m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;


@@ -57,30 +57,40 @@ public:
 #endif // wxUSE_DATETIME
     }
 
 #endif // wxUSE_DATETIME
     }
 

-    virtual ~wxFSFile() { if (m_Stream && m_destroy) delete m_Stream; }
+    virtual ~wxFSFile() { delete m_Stream; }

 
 

-    // returns stream. This doesn't _create_ stream, it only returns
-    // pointer to it.
-    wxInputStream *GetStream() const {return m_Stream;}
+    // returns stream. This doesn't give away ownership of the stream object.
+    wxInputStream *GetStream() const { return m_Stream; }

 
 

-    // gives away the ownership of stream
-    void DetachStream() { m_destroy = false; }
+    // gives away the ownership of the current stream.
+    wxInputStream *DetachStream()
+    {
+        wxInputStream *stream = m_Stream;
+        m_Stream = NULL;
+        return stream;
+    }
+
+    // deletes the current stream and takes ownership of another.
+    void SetStream(wxInputStream *stream)
+    {
+        delete m_Stream;
+        m_Stream = stream;
+    }

 
     // returns file's mime type
 
     // returns file's mime type

-    const wxString& GetMimeType() const {return m_MimeType;}
+    const wxString& GetMimeType() const { return m_MimeType; }

 
     // returns the original location (aka filename) of the file
 
     // returns the original location (aka filename) of the file

-    const wxString& GetLocation() const {return m_Location;}
+    const wxString& GetLocation() const { return m_Location; }

 
 

-    const wxString& GetAnchor() const {return m_Anchor;}
+    const wxString& GetAnchor() const { return m_Anchor; }

 
 #if wxUSE_DATETIME
 
 #if wxUSE_DATETIME

-    wxDateTime GetModificationTime() const {return m_Modif;}
+    wxDateTime GetModificationTime() const { return m_Modif; }

 #endif // wxUSE_DATETIME
 
 private:
     wxInputStream *m_Stream;
 #endif // wxUSE_DATETIME
 
 private:
     wxInputStream *m_Stream;

-    bool m_destroy;

     wxString m_Location;
     wxString m_MimeType;
     wxString m_Anchor;
     wxString m_Location;
     wxString m_MimeType;
     wxString m_Anchor;


@@ -157,11 +167,19 @@ protected:
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 

+// Open Bit Flags
+enum {
+    wxFS_READ = 1,      // Open for reading
+    wxFS_SEEKABLE = 4   // Returned stream will be seekable
+};
+
+WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL(wxFileSystemHandler*, wxFSHandlerHash, class WXDLLIMPEXP_BASE);
+

 class WXDLLIMPEXP_BASE wxFileSystem : public wxObject
 {
 public:
     wxFileSystem() : wxObject() { m_FindFileHandler = NULL;}
 class WXDLLIMPEXP_BASE wxFileSystem : public wxObject
 {
 public:
     wxFileSystem() : wxObject() { m_FindFileHandler = NULL;}

-    virtual ~wxFileSystem() { }
+    virtual ~wxFileSystem();

 
     // sets the current location. Every call to OpenFile is
     // relative to this location.
 
     // sets the current location. Every call to OpenFile is
     // relative to this location.


@@ -178,7 +196,7 @@ public:
     // It first tries to open the file in relative scope
     // (based on ChangePathTo()'s value) and then as an absolute
     // path.
     // It first tries to open the file in relative scope
     // (based on ChangePathTo()'s value) and then as an absolute
     // path.

-    wxFSFile* OpenFile(const wxString& location);
+    wxFSFile* OpenFile(const wxString& location, int flags = wxFS_READ);

 
     // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting
     // the query to directories or wxFILE for files only or 0 for either.
 
     // Finds first/next file that matches spec wildcard. flags can be wxDIR for restricting
     // the query to directories or wxFILE for files only or 0 for either.


@@ -196,7 +214,6 @@ public:
     // Removes FS handler
     static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler);
 
     // Removes FS handler
     static wxFileSystemHandler* RemoveHandler(wxFileSystemHandler *handler);
 

-

     // Returns true if there is a handler which can open the given location.
     static bool HasHandlerForPath(const wxString& location);
 
     // Returns true if there is a handler which can open the given location.
     static bool HasHandlerForPath(const wxString& location);
 


@@ -211,6 +228,8 @@ public:
 
 
 protected:
 
 
 protected:

+    wxFileSystemHandler *MakeLocal(wxFileSystemHandler *h);
+

     wxString m_Path;
             // the path (location) we are currently in
             // this is path, not file!
     wxString m_Path;
             // the path (location) we are currently in
             // this is path, not file!


@@ -222,6 +241,8 @@ protected:
             // list of FS handlers
     wxFileSystemHandler *m_FindFileHandler;
             // handler that succeed in FindFirst query
             // list of FS handlers
     wxFileSystemHandler *m_FindFileHandler;
             // handler that succeed in FindFirst query

+    wxFSHandlerHash m_LocalHandlers;
+            // Handlers local to this instance

 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)
     DECLARE_NO_COPY_CLASS(wxFileSystem)
 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)
     DECLARE_NO_COPY_CLASS(wxFileSystem)