X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b70ca266675b36fc6da1875f5944e52b8323d37..07243717e26bda497d5a8b325c2e6acf4ee033cf:/src/common/fs_mem.cpp diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 2bfcfd02be..eca35ac6ff 100644 --- 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); }