X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7672597c3eddc7a0c5fb97a168df6a69d2ea6d6a..68698f0308f5c46966b7de12b34f68ec23dd3ec8:/src/common/fs_mem.cpp?ds=inline diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index b3c156edd6..29c730164c 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -13,7 +13,7 @@ #include "wx/wxprec.h" -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -38,7 +38,7 @@ class MemFSHashObj : public wxObject m_Data = new char[len]; memcpy(m_Data, data, len); m_Len = len; - m_Time = wxDateTime::Now(); + InitTime(); } MemFSHashObj(wxMemoryOutputStream& stream) @@ -46,7 +46,7 @@ class MemFSHashObj : public wxObject m_Len = stream.GetSize(); m_Data = new char[m_Len]; stream.CopyTo(m_Data, m_Len); - m_Time = wxDateTime::Now(); + InitTime(); } ~MemFSHashObj() @@ -56,7 +56,19 @@ class MemFSHashObj : public wxObject 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 + } }; @@ -104,8 +116,11 @@ 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; }