X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11eaa98105f96ad6123283f519abf3ac0e5e5804..36bd690299dc72d49c4a945fa467ac7ce2342019:/src/common/fs_mem.cpp?ds=sidebyside diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 3b45f31ae2..4f8f84d4eb 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -8,7 +8,7 @@ #ifdef __GNUG__ -#pragma implementation +#pragma implementation "fs_mem.h" #endif #include "wx/wxprec.h" @@ -27,7 +27,6 @@ #include "wx/fs_mem.h" #include "wx/mstream.h" - class MemFSHashObj : public wxObject { public: @@ -112,9 +111,11 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString -wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags) +wxString wxMemoryFSHandler::FindFirst(const wxString& WXUNUSED(spec), + int WXUNUSED(flags)) { - wxLogWarning(wxT("wxMemoryFSHandler::FindFirst not implemented")); + wxFAIL_MSG(wxT("wxMemoryFSHandler::FindFirst not implemented")); + return wxEmptyString; } @@ -122,12 +123,12 @@ wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags) wxString wxMemoryFSHandler::FindNext() { - wxLogWarning(wxT("wxMemoryFSHandler::FindNext not implemented")); + wxFAIL_MSG(wxT("wxMemoryFSHandler::FindNext not implemented")); + return wxEmptyString; } - bool wxMemoryFSHandler::CheckHash(const wxString& filename) { if (m_Hash == NULL) @@ -157,13 +158,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); } }