cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not call CopyIcon() in CloneRefData(), HICON is going to be overwritten or invalidated anyhow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-09-17 22:09:23 +00:00
parent e5544e77ec
commit d79c8ea96f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/icon.cpp
View File

@ -109,16 +109,12 @@ wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
if ( !data )
return NULL;
wxIcon *self = wx_const_cast(wxIcon *, this);
self->UnRef();
self->m_refData = new wxIconRefData(*data);
if ( data->m_hIcon )
{
::CopyIcon(HICON(data->m_hIcon));
}
return m_refData;
// we don't have to copy m_hIcon because we're only called from SetHICON()
// which overwrites m_hIcon anyhow currently
//
// and if we're called from SetWidth/Height/Depth(), it doesn't make sense
// to copy it neither as the handle would be inconsistent with the new size
return new wxIconRefData(*data);
}
void wxIcon::CopyFromBitmap(const wxBitmap& bmp)