X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..faa112c4ca49e1f1d9467107d6e54cb9986bd900:/src/common/fs_mem.cpp?ds=sidebyside diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 19f3abe1af..7475dfd1e9 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -3,21 +3,9 @@ // Purpose: in-memory file system // Author: Vaclav Slavik // Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWidgets Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) -// Some older compilers (such as EMX) cannot handle -// #pragma interface/implementation correctly, iff -// #pragma implementation is used in _two_ translation -// units (as created by e.g. event.cpp compiled for -// libwx_base and event.cpp compiled for libwx_gui_core). -// So we must not use those pragmas for those compilers in -// such files. -#pragma implementation "fs_mem.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -53,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]; @@ -79,7 +67,7 @@ class MemFSHashObj : public wxObject { #if wxUSE_DATETIME m_Time = wxDateTime::Now(); -#endif // wxUSE_DATETIME +#endif // wxUSE_DATETIME } }; @@ -137,7 +125,7 @@ wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxSt GetAnchor(location) #if wxUSE_DATETIME , obj -> m_Time -#endif // wxUSE_DATETIME +#endif // wxUSE_DATETIME ); } else return NULL; @@ -175,10 +163,10 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename) wxString s; s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str()); wxLogError(s); - return FALSE; + return false; } else - return TRUE; + return true; } @@ -216,7 +204,9 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename) #if wxUSE_IMAGE /*static*/ void -wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type) +wxMemoryFSHandler::AddFile(const wxString& filename, + const wxImage& image, + long type) { if (!CheckHash(filename)) return; @@ -232,10 +222,15 @@ wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type) } } -/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type) +/*static*/ void +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