merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -159,13 +159,13 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
wxMemoryOutputStream mems;
if (image.Ok() && image.SaveFile(mems, type))
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());
printf("'%s'\n", s.c_str());
wxPrintf(wxT("'%s'\n"), s.c_str());
wxLogError(s);
}
}