X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e721c7a4bb6b253d64ae580e73853ed76d0ad03..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/filesys.h

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 00214c18af..026fff1f28 100644
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -12,6 +12,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_FILESYSTEM
+
 #if !wxUSE_STREAMS
 #error You cannot compile virtual file systems without wxUSE_STREAMS
 #endif
@@ -20,8 +22,6 @@
 #error You cannot compile wxHTML without virtual file systems
 #endif
 
-#if wxUSE_FILESYSTEM
-
 #include "wx/stream.h"
 #include "wx/datetime.h"
 #include "wx/filename.h"
@@ -99,7 +99,7 @@ private:
 #endif // wxUSE_DATETIME
 
     DECLARE_ABSTRACT_CLASS(wxFSFile)
-    DECLARE_NO_COPY_CLASS(wxFSFile)
+    wxDECLARE_NO_COPY_CLASS(wxFSFile);
 };
 
 
@@ -247,7 +247,7 @@ protected:
             // Handlers local to this instance
 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)
-    DECLARE_NO_COPY_CLASS(wxFileSystem)
+    wxDECLARE_NO_COPY_CLASS(wxFileSystem);
 };
 
 
@@ -293,7 +293,20 @@ protected:
     static wxString ms_root;
 };
 
+// Stream reading data from wxFSFile: this allows to use virtual files with any
+// wx functions accepting streams.
+class WXDLLIMPEXP_BASE wxFSInputStream : public wxWrapperInputStream
+{
+public:
+    // Notice that wxFS_READ is implied in flags.
+    wxFSInputStream(const wxString& filename, int flags = 0);
+    virtual ~wxFSInputStream();
+
+private:
+    wxFSFile* m_file;
 
+    wxDECLARE_NO_COPY_CLASS(wxFSInputStream);
+};
 
 #endif
   // wxUSE_FILESYSTEM