X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/fs_mem.h?ds=sidebyside diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index ad0927f42b..6688537ca5 100644 --- 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 @@ -15,9 +15,13 @@ #include "wx/filesys.h" +#include "wx/hashmap.h" + +class wxMemoryFSFile; +WX_DECLARE_STRING_HASH_MAP(wxMemoryFSFile *, wxMemoryFSHash); + #if wxUSE_GUI - class WXDLLIMPEXP_FWD_CORE wxBitmap; - class WXDLLIMPEXP_FWD_CORE wxImage; + #include "wx/bitmap.h" #endif // wxUSE_GUI // ---------------------------------------------------------------------------- @@ -51,8 +55,21 @@ public: 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, - long type); + wxBitmapType type); static void AddFile(const wxString& filename, const wxBitmap& bitmap, - long type); + wxBitmapType type); #endif // wxUSE_IMAGE };