From 75b1ff75c42644eb36552762652e4b0c9ff071bc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 2 Nov 2012 14:11:01 +0000 Subject: final switch to the typed icolib api git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AvatarHistory/src/icolib.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'plugins/AvatarHistory') diff --git a/plugins/AvatarHistory/src/icolib.cpp b/plugins/AvatarHistory/src/icolib.cpp index a4105eef3c..76bc96d80c 100644 --- a/plugins/AvatarHistory/src/icolib.cpp +++ b/plugins/AvatarHistory/src/icolib.cpp @@ -27,9 +27,9 @@ static HICON LoadIconEx(IconIndex i) HICON hIcon; if (hHooks[4]) - hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)iconList[(int)i].szName); + hIcon = Skin_GetIcon(iconList[(int)i].szName); else - hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(iconList[(int)i].defIconID), + hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(iconList[(int)i].defIconID), IMAGE_ICON, 0, 0, 0); return hIcon; @@ -39,7 +39,7 @@ static HICON LoadIconEx(IconIndex i) static void ReleaseIconEx(HICON hIcon) { if (hHooks[4]) - CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0); + Skin_ReleaseIcon(hIcon); else DestroyIcon(hIcon); } @@ -75,7 +75,7 @@ void SetupIcoLib() sid.ptszDefaultFile = path; sid.flags = SIDF_ALL_TCHAR; - for (unsigned i = 0; i < MAX_REGS(iconList); i++) + for (unsigned i = 0; i < MAX_REGS(iconList); i++) { if (!iconList[i].core) { @@ -129,7 +129,6 @@ HICON createProtoOverlayedIcon(HANDLE hContact) HICON resIcon = getOverlayedIcon(icon0, icon1, FALSE); ReleaseIconEx(icon1); - CallService(MS_SKIN2_RELEASEICON, (WPARAM)icon0, 0); - + Skin_ReleaseIcon(icon0); return resIcon; } -- cgit v1.2.3