Merge branch 'besh81-hotfix-1.6.2' into hotfix-1.6.2

This commit is contained in:
Jinhao 2018-12-06 22:58:11 +08:00
commit 32333c0900

View File

@ -379,7 +379,15 @@ namespace nana{ namespace drawerbase
void trigger::icon(const nana::paint::image& img)
{
if(img.empty()) return;
if(img.empty())
{
if(attr_.icon)
{
delete attr_.icon;
attr_.icon = 0;
}
return;
}
if(nullptr == attr_.icon)
attr_.icon = new paint::image;