X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7266b6723573ce6317577226cb1e5d32826e24e8..73ef393701bd6c2c689a05d5637cc701e2f5cc2f:/src/x11/bitmap.cpp

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index cd66d61993..9a4f71feb1 100644
--- 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;
 }