diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index cd66d61993..794b7df0d8 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -1044,6 +1044,9 @@ wxImage wxBitmap::ConvertToImage() const bool wxBitmap::CopyFromIcon(const wxIcon& icon) { - // TODO - return FALSE; + wxBitmap* bitmap = (wxBitmap*) & icon; + + *this = *bitmap; + + return TRUE; } diff --git a/src/x11/icon.cpp b/src/x11/icon.cpp index 11cea5bf32..e357f22925 100644 --- a/src/x11/icon.cpp +++ b/src/x11/icon.cpp @@ -81,6 +81,7 @@ bool wxIcon::LoadFile(const wxString& filename, long type, bool wxIcon::CopyFromBitmap(const wxBitmap& bitmap) { - // TODO - return FALSE; + wxIcon* icon = (wxIcon*) (& bitmap); + *this = *icon; + return TRUE; }