X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..a340b80d8a692f5308d26c1c1b95fd689a1d7eb3:/src/common/fs_mem.cpp diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 6fe6c097bf..7475dfd1e9 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -41,7 +41,7 @@ class MemFSHashObj : public wxObject InitTime(); } - MemFSHashObj(wxMemoryOutputStream& stream) + MemFSHashObj(const wxMemoryOutputStream& stream) { m_Len = stream.GetSize(); m_Data = new char[m_Len]; @@ -227,8 +227,10 @@ wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type) { +#if !defined(__WXMSW__) || wxUSE_WXDIB wxImage img = bitmap.ConvertToImage(); AddFile(filename, img, type); +#endif } #endif // wxUSE_IMAGE