X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5d7b81ecf829d5b0f3455bfa6e35736313f223c..697c314b162ff4758db0047e548d5401994d2c70:/src/common/fs_mem.cpp diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 3da55fdc8d..4d9ba72339 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -23,7 +23,6 @@ #include "wx/hash.h" #include "wx/wxcrtvararg.h" #if wxUSE_GUI - #include "wx/bitmap.h" #include "wx/image.h" #endif // wxUSE_GUI #endif @@ -233,12 +232,12 @@ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxImage& image, - long type) + wxBitmapType type) { if (!CheckHash(filename)) return; wxMemoryOutputStream mems; - if (image.Ok() && image.SaveFile(mems, (int)type)) + if (image.Ok() && image.SaveFile(mems, type)) { m_Hash->Put ( @@ -262,7 +261,7 @@ wxMemoryFSHandler::AddFile(const wxString& filename, /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, - long type) + wxBitmapType type) { #if !defined(__WXMSW__) || wxUSE_WXDIB wxImage img = bitmap.ConvertToImage();