Implemented CopyFromBitmap, CopyFromIcon

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2002-02-10 23:32:39 +00:00
parent 8354aa92a1
commit b6ed456530
2 changed files with 8 additions and 4 deletions

View File

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

View File

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