diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-09-11 23:48:27 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-09-11 23:48:27 +0300 |
| commit | b0f44b16bd1138de85a5d17bb42151742f9c8298 (patch) | |
| tree | 3d9a6607f042acb8d44ece5f3fb08a4125a94e45 /plugins/TipperYM/src/popwin.cpp | |
| parent | 9a774c4e9e76e660c14a5f725252bbc275b13906 (diff) | |
Tipper: all icons added to icolib (fixes #302)
Diffstat (limited to 'plugins/TipperYM/src/popwin.cpp')
| -rw-r--r-- | plugins/TipperYM/src/popwin.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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) { |