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 cd66d61993de03e452cc8fe42edc32e0ccb21e43..794b7df0d87cf64579794286bde54222b3a8c5bf 100644 (file)
--- 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 11cea5bf32785ce96819817b683042b943e8dc88..e357f22925e7a1d2125fdb3b2ade93f6b6662f94 100644 (file)
--- 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;
 }