Implemented CopyFromBitmap, CopyFromIcon

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

src/x11/bitmap.cpp

@@ -1044,6 +1044,9 @@ wxImage wxBitmap::ConvertToImage() const
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
-    // TODO
+    wxBitmap* bitmap = (wxBitmap*) & icon;
-    return FALSE;
+
+    *this = *bitmap;
+
+    return TRUE;
 }

src/x11/icon.cpp

@@ -81,6 +81,7 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
 
 bool wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
 {
-    // TODO
+    wxIcon* icon = (wxIcon*) (& bitmap);
-    return FALSE;
+    *this = *icon;
+    return TRUE;
 }