Should only add // under MSW -- not on Unix, not on Mac.

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 2bfcfd02be1240efd3c5b24b75813cf44c2a16f4..eca35ac6ff4b58a438f5495fee1e3d417a9d5e60 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
 
@@ -70,7 +70,6 @@ wxHashTable *wxMemoryFSHandler::m_Hash = NULL;
 
 wxMemoryFSHandler::wxMemoryFSHandler() : wxFileSystemHandler()
 {
-    m_Hash = NULL;
 }
 
 
@@ -174,7 +173,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);
 }