X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc1dcfc1aa7cb30753c10b06409afae8e895ffa0..a6c7a0f826d5e156c177b4755365c3eb33e9b933:/src/common/fs_mem.cpp diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index bc089b0990..37a272bbdc 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -7,86 +7,116 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) +// Some older compilers (such as EMX) cannot handle +// #pragma interface/implementation correctly, iff +// #pragma implementation is used in _two_ translation +// units (as created by e.g. event.cpp compiled for +// libwx_base and event.cpp compiled for libwx_gui_core). +// So we must not use those pragmas for those compilers in +// such files. +#pragma implementation "fs_mem.h" #endif #include "wx/wxprec.h" -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif #if wxUSE_FILESYSTEM && wxUSE_STREAMS +#include "wx/fs_mem.h" + +#if wxUSE_GUI + #include "wx/image.h" + #include "wx/bitmap.h" +#endif // wxUSE_GUI + #ifndef WXPRECOMP -#include "wx/wx.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/hash.h" #endif -#include "wx/filesys.h" -#include "wx/fs_mem.h" #include "wx/mstream.h" - class MemFSHashObj : public wxObject { public: - + MemFSHashObj(const void *data, size_t len) { m_Data = new char[len]; memcpy(m_Data, data, len); m_Len = len; - m_Time = wxDateTime::Now(); + InitTime(); } - + MemFSHashObj(wxMemoryOutputStream& stream) { m_Len = stream.GetSize(); m_Data = new char[m_Len]; stream.CopyTo(m_Data, m_Len); - m_Time = wxDateTime::Now(); + InitTime(); } - + ~MemFSHashObj() { delete[] m_Data; } - + char *m_Data; size_t m_Len; +#if wxUSE_DATETIME wxDateTime m_Time; +#endif // wxUSE_DATETIME + + DECLARE_NO_COPY_CLASS(MemFSHashObj) + + private: + void InitTime() + { +#if wxUSE_DATETIME + m_Time = wxDateTime::Now(); +#endif // wxUSE_DATETIME + } }; +#if wxUSE_BASE + //-------------------------------------------------------------------------------- // wxMemoryFSHandler //-------------------------------------------------------------------------------- -wxHashTable *wxMemoryFSHandler::m_Hash = NULL; +wxHashTable *wxMemoryFSHandlerBase::m_Hash = NULL; -wxMemoryFSHandler::wxMemoryFSHandler() : wxFileSystemHandler() +wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler() { - m_Hash = NULL; } -wxMemoryFSHandler::~wxMemoryFSHandler() +wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase() { // 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; - m_Hash = NULL; + + if (m_Hash) + { + WX_CLEAR_HASH_TABLE(*m_Hash); + delete m_Hash; + m_Hash = NULL; + } } -bool wxMemoryFSHandler::CanOpen(const wxString& location) +bool wxMemoryFSHandlerBase::CanOpen(const wxString& location) { wxString p = GetProtocol(location); return (p == wxT("memory")); @@ -95,7 +125,7 @@ bool wxMemoryFSHandler::CanOpen(const wxString& location) -wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) +wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { if (m_Hash) { @@ -104,40 +134,42 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString else return new wxFSFile(new wxMemoryInputStream(obj -> m_Data, obj -> m_Len), location, GetMimeTypeFromExt(location), - GetAnchor(location), - obj -> m_Time); + GetAnchor(location) +#if wxUSE_DATETIME + , obj -> m_Time +#endif // wxUSE_DATETIME + ); } else return NULL; } -wxString wxMemoryFSHandler::FindFirst(const wxString& WXUNUSED(spec), +wxString wxMemoryFSHandlerBase::FindFirst(const wxString& WXUNUSED(spec), int WXUNUSED(flags)) { - wxFAIL_MSG(wxT("wxMemoryFSHandler::FindFirst not implemented")); + wxFAIL_MSG(wxT("wxMemoryFSHandlerBase::FindFirst not implemented")); return wxEmptyString; } -wxString wxMemoryFSHandler::FindNext() +wxString wxMemoryFSHandlerBase::FindNext() { - wxFAIL_MSG(wxT("wxMemoryFSHandler::FindNext not implemented")); + wxFAIL_MSG(wxT("wxMemoryFSHandlerBase::FindNext not implemented")); return wxEmptyString; } -bool wxMemoryFSHandler::CheckHash(const wxString& filename) +bool wxMemoryFSHandlerBase::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; @@ -150,42 +182,13 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) } - -#if wxUSE_GUI - -/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type) -{ - if (!CheckHash(filename)) return; - - - wxMemoryOutputStream mems; - if (image.Ok() && image.SaveFile(mems, type)) - m_Hash -> Put(filename, new MemFSHashObj(mems)); - else - { - wxString s; - s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str()); - printf("'%s'\n", s.c_str()); - wxLogError(s); - } -} - - -/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type) -{ - wxImage img(bitmap); - AddFile(filename, img, type); -} - -#endif - -/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata) +/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata) { AddFile(filename, (const void*) textdata.mb_str(), textdata.Length()); } -/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const void *binarydata, size_t size) +/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const void *binarydata, size_t size) { if (!CheckHash(filename)) return; m_Hash -> Put(filename, new MemFSHashObj(binarydata, size)); @@ -193,7 +196,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) -/*static*/ void wxMemoryFSHandler::RemoveFile(const wxString& filename) +/*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename) { if (m_Hash == NULL || m_Hash -> Get(filename) == NULL) @@ -207,6 +210,37 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) delete m_Hash -> Delete(filename); } +#endif // wxUSE_BASE + +#if wxUSE_GUI + +#if wxUSE_IMAGE +/*static*/ void +wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type) +{ + if (!CheckHash(filename)) return; + + wxMemoryOutputStream mems; + if (image.Ok() && image.SaveFile(mems, (int)type)) + m_Hash -> Put(filename, new MemFSHashObj(mems)); + else + { + wxString s; + s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str()); + wxPrintf(wxT("'%s'\n"), s.c_str()); + wxLogError(s); + } +} +#endif // wxUSE_IMAGE + +/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type) +{ + wxImage img = bitmap.ConvertToImage(); + AddFile(filename, img, type); +} + +#endif #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP +