allow specifying the mask colour in wxImage::ConvertAlphaToMask() (closes #10143)

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index fe1139b06530bf1ce9b2a980ddf985594a5a99af..4c478b759b0fea372c3f412c4346e1e890b78c8b 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -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
 
 // ----------------------------------------------------------------------------


@@ -51,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;

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


@@ -99,11 +116,11 @@ public:
 #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
 
 };