X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/msw/icon.cpp?ds=sidebyside diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index 778aace5f3..dccefc51cc 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -86,7 +86,7 @@ wxIcon::wxIcon(const wxIconLocation& loc) wxString fullname = loc.GetFileName(); if ( loc.GetIndex() ) { - fullname << _T(';') << loc.GetIndex(); + fullname << wxT(';') << loc.GetIndex(); } //else: 0 is default @@ -156,3 +156,14 @@ bool wxIcon::LoadFile(const wxString& filename, return handler->Load(this, filename, type, desiredWidth, desiredHeight); } + +bool wxIcon::CreateFromHICON(WXHICON icon) +{ + SetHICON(icon); + if ( !IsOk() ) + return false; + + SetSize(wxGetHiconSize(icon)); + + return true; +}