projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take into account icon mask in wxStaticBitmap
[wxWidgets.git]
/
src
/
common
/
fs_mem.cpp
diff --git
a/src/common/fs_mem.cpp
b/src/common/fs_mem.cpp
index 2bfcfd02be1240efd3c5b24b75813cf44c2a16f4..b3c156edd6881a9077c85cdfb5b4675173964b25 100644
(file)
--- a/
src/common/fs_mem.cpp
+++ b/
src/common/fs_mem.cpp
@@
-70,7
+70,6
@@
wxHashTable *wxMemoryFSHandler::m_Hash = NULL;
wxMemoryFSHandler::wxMemoryFSHandler() : wxFileSystemHandler()
{
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)
{
/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
{
- wxImage img
(bitmap
);
+ wxImage img
= bitmap.ConvertToImage(
);
AddFile(filename, img, type);
}
AddFile(filename, img, type);
}