Applied patch [ 666379 ] CalCtrl doesn't use best sizes for the year combobox

[wxWidgets.git] / src / common / fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index c3f05cc6f54763579f58072c80e4cdc5fb417a98..19f5da5fc51f6969933997e6cfed99f4e1ce7a1d 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
@@ -22,6 +22,7 @@
 #ifndef WXPRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/hash.h"
 #endif
 
 #include "wx/filesys.h"
@@ -56,6 +57,8 @@ class MemFSHashObj : public wxObject
         char *m_Data;
         size_t m_Len;
         wxDateTime m_Time;
+
+    DECLARE_NO_COPY_CLASS(MemFSHashObj)
 };
 
 
@@ -69,7 +72,6 @@ wxHashTable *wxMemoryFSHandler::m_Hash = NULL;
 
 wxMemoryFSHandler::wxMemoryFSHandler() : wxFileSystemHandler()
 {
-    m_Hash = NULL;
 }
 
 
@@ -173,7 +175,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
 {
-    wxImage img(bitmap);
+    wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
 }