X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a62848fdba49396eba4f52c037d2dc82130274b4..d4d8988c72e26ea5ef68b87a53691da7c3751a95:/src/common/fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index aa59f1b48c..7475dfd1e9 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -6,18 +6,6 @@
 // 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];
@@ -239,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