From b6ed456530113db11efc397e2a0a4ecfa7c3f3fc Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 10 Feb 2002 23:32:39 +0000 Subject: [PATCH] Implemented CopyFromBitmap, CopyFromIcon git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/bitmap.cpp | 7 +++++-- src/x11/icon.cpp | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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; } -- 2.50.0