From b0f44b16bd1138de85a5d17bb42151742f9c8298 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 11 Sep 2017 23:48:27 +0300 Subject: Tipper: all icons added to icolib (fixes #302) --- plugins/TipperYM/src/popwin.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins/TipperYM/src/popwin.cpp') diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index b7fa55bcb7..6e8cebc7eb 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -730,7 +730,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if (!hMenu) return 0; - HICON hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ITEM_ALL), IMAGE_ICON, 0, 0, LR_LOADTRANSPARENT); + HICON hIcon = IcoLib_GetIconByHandle(iconList[1].hIcolib); if (!hIcon) { DestroyMenu(hMenu); return 0; @@ -739,7 +739,6 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa ICONINFO iconInfo; GetIconInfo(hIcon, &iconInfo); HBITMAP hbmpAllItems = iconInfo.hbmColor; - DestroyIcon(hIcon); AppendMenu(hMenu, MF_STRING, COPYMENU_ALLITEMS_LABELS, LPGENW("Copy all items with labels")); AppendMenu(hMenu, MF_STRING, COPYMENU_ALLITEMS, LPGENW("Copy all items")); @@ -752,7 +751,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa SetMenuItemBitmaps(hMenu, COPYMENU_ALLITEMS, MF_BYCOMMAND, hbmpAllItems, hbmpAllItems); SetMenuItemBitmaps(hMenu, COPYMENU_AVATAR, MF_BYCOMMAND, hbmpAllItems, hbmpAllItems); - hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ITEM), IMAGE_ICON, 0, 0, LR_LOADTRANSPARENT); + hIcon = IcoLib_GetIconByHandle(iconList[0].hIcolib); if (!hIcon) { DeleteObject(hbmpAllItems); DestroyMenu(hMenu); @@ -761,7 +760,6 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa GetIconInfo(hIcon, &iconInfo); HBITMAP hbmpItem = iconInfo.hbmColor; - DestroyIcon(hIcon); for (int i = 0; i < pwd->iRowCount; i++) { if (pwd->rows[i].swzValue) { -- cgit v1.2.3