]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/fs_mem.cpp
wxComboControl and wxOwnerDrawnComboBox (patch 1479938)
[wxWidgets.git] / src / common / fs_mem.cpp
index 6fe6c097bf51d8ed3415929e9a56727a3b215749..7475dfd1e9aa3881ffdd23afc4a7e380f8b3e652 100644 (file)
@@ -41,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];
@@ -227,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