OSX adaptions

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 7dd33a3c7077b933d5ade39f224fad5d1ab19cc0..6688537ca563e1734e45865c264e3540bf5a60a6 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik


@@ -15,9 +15,13 @@
 
 #include "wx/filesys.h"
 
 
 #include "wx/filesys.h"
 

+#include "wx/hashmap.h"
+
+class wxMemoryFSFile;
+WX_DECLARE_STRING_HASH_MAP(wxMemoryFSFile *, wxMemoryFSHash);
+

 #if wxUSE_GUI
 #if wxUSE_GUI

-    class WXDLLIMPEXP_CORE wxBitmap;
-    class WXDLLIMPEXP_CORE wxImage;
+    #include "wx/bitmap.h"

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -35,6 +39,12 @@ public:
     // name "memory:" + filename
     static void AddFile(const wxString& filename, const wxString& textdata);
     static void AddFile(const wxString& filename, const void *binarydata, size_t size);
     // name "memory:" + filename
     static void AddFile(const wxString& filename, const wxString& textdata);
     static void AddFile(const wxString& filename, const void *binarydata, size_t size);

+    static void AddFileWithMimeType(const wxString& filename,
+                                    const wxString& textdata,
+                                    const wxString& mimetype);
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const void *binarydata, size_t size,
+                                    const wxString& mimetype);

 
     // Remove file from memory FS and free occupied memory
     static void RemoveFile(const wxString& filename);
 
     // Remove file from memory FS and free occupied memory
     static void RemoveFile(const wxString& filename);


@@ -45,8 +55,21 @@ public:
     virtual wxString FindNext();
 
 protected:
     virtual wxString FindNext();
 
 protected:

-    static bool CheckHash(const wxString& filename);
-    static wxHashTable *m_Hash;
+    // check that the given file is not already present in m_Hash; logs an
+    // error and returns false if it does exist
+    static bool CheckDoesntExist(const wxString& filename);
+
+    // the hash map indexed by the names of the files stored in the memory FS
+    static wxMemoryFSHash m_Hash;
+
+    // the file name currently being searched for, i.e. the argument of the
+    // last FindFirst() call or empty string if FindFirst() hasn't been called
+    // yet or FindNext() didn't find anything
+    wxString m_findArgument;
+
+    // iterator into m_Hash used by FindFirst/Next(), possibly m_Hash.end() or
+    // even invalid (can only be used when m_findArgument is not empty)
+    wxMemoryFSHash::const_iterator m_findIter;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -73,15 +96,31 @@ public:
     {
         wxMemoryFSHandlerBase::AddFile(filename, binarydata, size);
     }
     {
         wxMemoryFSHandlerBase::AddFile(filename, binarydata, size);
     }

+    static void AddFileWithMimeType(const wxString& filename,
+                                    const wxString& textdata,
+                                    const wxString& mimetype)
+    {
+        wxMemoryFSHandlerBase::AddFileWithMimeType(filename,
+                                                   textdata,
+                                                   mimetype);
+    }
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const void *binarydata, size_t size,
+                                    const wxString& mimetype)
+    {
+        wxMemoryFSHandlerBase::AddFileWithMimeType(filename,
+                                                   binarydata, size,
+                                                   mimetype);
+    }

 
 #if wxUSE_IMAGE
     static void AddFile(const wxString& filename,
                         const wxImage& image,
 
 #if wxUSE_IMAGE
     static void AddFile(const wxString& filename,
                         const wxImage& image,

-                        long type);
+                        wxBitmapType type);

 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,
 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,

-                        long type);
+                        wxBitmapType type);

 #endif // wxUSE_IMAGE
 
 };
 #endif // wxUSE_IMAGE
 
 };