#include "wx/wxprec.h"
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_FILESYSTEM && wxUSE_STREAMS
#ifndef WXPRECOMP
-#include "wx/wx.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/hash.h"
#endif
#include "wx/filesys.h"
class MemFSHashObj : public wxObject
{
public:
-
+
MemFSHashObj(const void *data, size_t len)
{
m_Data = new char[len];
m_Len = len;
m_Time = wxDateTime::Now();
}
-
+
MemFSHashObj(wxMemoryOutputStream& stream)
{
m_Len = stream.GetSize();
stream.CopyTo(m_Data, m_Len);
m_Time = wxDateTime::Now();
}
-
+
~MemFSHashObj()
{
delete[] m_Data;
}
-
+
char *m_Data;
size_t m_Len;
wxDateTime m_Time;
+
+ DECLARE_NO_COPY_CLASS(MemFSHashObj)
};
wxMemoryFSHandler::wxMemoryFSHandler() : wxFileSystemHandler()
{
- m_Hash = NULL;
}
// as only one copy of FS handler is supposed to exist, we may silently
// delete static data here. (There is no way how to remove FS handler from
// wxFileSystem other than releasing _all_ handlers.)
-
- if (m_Hash) delete m_Hash;
+
+ if (m_Hash) delete m_Hash;
m_Hash = NULL;
}
bool wxMemoryFSHandler::CheckHash(const wxString& filename)
{
- if (m_Hash == NULL)
+ if (m_Hash == NULL)
{
m_Hash = new wxHashTable(wxKEY_STRING);
m_Hash -> DeleteContents(TRUE);
}
-
+
if (m_Hash -> Get(filename) != NULL)
{
wxString s;
{
if (!CheckHash(filename)) return;
-
+
wxMemoryOutputStream mems;
if (image.Ok() && image.SaveFile(mems, (int)type))
m_Hash -> Put(filename, new MemFSHashObj(mems));
/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
{
- wxImage img(bitmap);
+ wxImage img = bitmap.ConvertToImage();
AddFile(filename, img, type);
}