From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 10 Feb 2002 23:32:39 +0000 (+0000)
Subject: Implemented CopyFromBitmap, CopyFromIcon
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b6ed456530113db11efc397e2a0a4ecfa7c3f3fc

Implemented CopyFromBitmap, CopyFromIcon


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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;
 }