allow using CPPUNIT_ASSERT_EQUAL(int,unsigned) even on 64 bit platforms (see r59576)

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 9d43c4287ffacff28c4f9a22d9be1d09d35a2bb4..4c478b759b0fea372c3f412c4346e1e890b78c8b 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -15,7 +15,10 @@
 
 #include "wx/filesys.h"
 
 
 #include "wx/filesys.h"
 

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

 
 #if wxUSE_GUI
     #include "wx/bitmap.h"
 
 #if wxUSE_GUI
     #include "wx/bitmap.h"


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

-    static bool CheckHash(const wxString& filename);
-    static wxMemoryFSHash *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;

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