X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/446e5259d796ee4428ed90b5943c76df032095be..e6fd62dd849e051b82374afd31e3d62454c98483:/include/wx/filesys.h

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 6625b40bb8..bda6d7c5dd 100644
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -10,11 +10,7 @@
 #ifndef __FILESYS_H__
 #define __FILESYS_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "filesys.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if !wxUSE_STREAMS
 #error You cannot compile virtual file systems without wxUSE_STREAMS
@@ -52,6 +48,7 @@ public:
              )
     {
         m_Stream = stream;
+        m_destroy = true;
         m_Location = loc;
         m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;
@@ -60,12 +57,15 @@ public:
 #endif // wxUSE_DATETIME
     }
 
-    virtual ~wxFSFile() { if (m_Stream) delete m_Stream; }
+    virtual ~wxFSFile() { if (m_Stream && m_destroy) delete m_Stream; }
 
     // returns stream. This doesn't _create_ stream, it only returns
     // pointer to it.
     wxInputStream *GetStream() const {return m_Stream;}
 
+    // gives away the ownership of stream
+    void DetachStream() { m_destroy = false; }
+
     // returns file's mime type
     const wxString& GetMimeType() const {return m_MimeType;}
 
@@ -80,6 +80,7 @@ public:
 
 private:
     wxInputStream *m_Stream;
+    bool m_destroy;
     wxString m_Location;
     wxString m_MimeType;
     wxString m_Anchor;
@@ -107,7 +108,7 @@ class WXDLLIMPEXP_BASE wxFileSystemHandler : public wxObject
 public:
     wxFileSystemHandler() : wxObject() {}
 
-    // returns TRUE if this handler is able to open given location
+    // returns true if this handler is able to open given location
     virtual bool CanOpen(const wxString& location) = 0;
 
     // opens given file and returns pointer to input stream.
@@ -165,10 +166,10 @@ public:
     // sets the current location. Every call to OpenFile is
     // relative to this location.
     // NOTE !!
-    // unless is_dir = TRUE 'location' is *not* the directory but
+    // unless is_dir = true 'location' is *not* the directory but
     // file contained in this directory
     // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")
-    void ChangePathTo(const wxString& location, bool is_dir = FALSE);
+    void ChangePathTo(const wxString& location, bool is_dir = false);
 
     wxString GetPath() const {return m_Path;}
 
@@ -185,10 +186,20 @@ public:
     wxString FindFirst(const wxString& spec, int flags = 0);
     wxString FindNext();
 
+    // find a file in a list of directories, returns false if not found
+    bool FindFileInPath(wxString *pStr, const wxChar *path, const wxChar *file);
+
     // Adds FS handler.
-    // In fact, this class is only front-end to the FS hanlers :-)
+    // In fact, this class is only front-end to the FS handlers :-)
     static void AddHandler(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);
+
     // remove all items from the m_Handlers list
     static void CleanUpHandlers();