X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..3c99602b795292c52aafd12c71cac668ffdbf08f:/src/msw/icon.cpp diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index 9064101a53..2fbdb94996 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -102,6 +102,21 @@ wxIcon::~wxIcon() { } +wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const +{ + const wxIconRefData * + data = wx_static_cast(const wxIconRefData *, dataOrig); + if ( !data ) + return NULL; + + // 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) { #ifndef __WXMICROWIN__ @@ -135,7 +150,7 @@ bool wxIcon::LoadFile(const wxString& filename, if ( !handler ) { // say something? - return FALSE; + return false; } return handler->Load(this, filename, type, desiredWidth, desiredHeight);