use wxHashMap, not wxHashTable in wxXPMDecoder

[wxWidgets.git] / src / x11 / bitmap.cpp

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index cd66d61993de03e452cc8fe42edc32e0ccb21e43..9a4f71feb1d12d09b3effc572a60a49a9f14d161 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -531,11 +531,13 @@ wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour)
     srcDC.SelectObject(bitmap);
     destDC.SelectObject(newBitmap);
 
+#if 0
     wxBrush brush(colour, wxSOLID);
     destDC.SetOptimization(FALSE);
     destDC.SetBackground(brush);
     destDC.Clear();
     destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & srcDC, 0, 0, wxCOPY, TRUE);
+#endif
 
     return newBitmap;
 }
@@ -1044,6 +1046,9 @@ wxImage wxBitmap::ConvertToImage() const
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
-    // TODO
-    return FALSE;
+    wxBitmap* bitmap = (wxBitmap*) & icon;
+
+    *this = *bitmap;
+
+    return TRUE;
 }