X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcb86da02199f7fea33f7b76a5c0fc95873f93f3..f5ba273ecd799f652736ce2bc830283787302a56:/src/common/fs_mem.cpp diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index adee5e641e..3b45f31ae2 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -17,7 +17,7 @@ #pragma hdrstop #endif -#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS +#if wxUSE_FILESYSTEM && wxUSE_STREAMS #ifndef WXPRECOMP #include "wx/wx.h" @@ -37,7 +37,7 @@ class MemFSHashObj : public wxObject m_Data = new char[len]; memcpy(m_Data, data, len); m_Len = len; - m_Time = wxDateTime::Today(); + m_Time = wxDateTime::Now(); } MemFSHashObj(wxMemoryOutputStream& stream) @@ -45,7 +45,7 @@ class MemFSHashObj : public wxObject m_Len = stream.GetSize(); m_Data = new char[m_Len]; stream.CopyTo(m_Data, m_Len); - m_Time = wxDateTime::Today(); + m_Time = wxDateTime::Now(); } ~MemFSHashObj() @@ -149,6 +149,8 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) +#if wxUSE_GUI + /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type) { if (!CheckHash(filename)) return; @@ -173,6 +175,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) AddFile(filename, img, type); } +#endif /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata) { @@ -204,4 +207,4 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) -#endif // wxUSE_FS_ZIP +#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP