From 75b1ff75c42644eb36552762652e4b0c9ff071bc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/PackUpdater/Src/Notifications.cpp | 15 +++++----------
 plugins/PackUpdater/Src/PackUpdater.cpp   |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'plugins/PackUpdater/Src')

diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp
index 5c336358a4..ea402b2373 100644
--- a/plugins/PackUpdater/Src/Notifications.cpp
+++ b/plugins/PackUpdater/Src/Notifications.cpp
@@ -115,19 +115,14 @@ static VOID MakePopupAction(POPUPACTION &pa, INT id)
 	pa.flags = PAF_ENABLED;
 	pa.wParam = MAKEWORD(id, BN_CLICKED);
 	pa.lParam = 0;
-	switch (id)
-	{
+	switch (id) {
 	case IDYES:
-		{
-			pa.lchIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"btn_ok");
-			strncpy_s(pa.lpzTitle, MODNAME"/Yes", SIZEOF(pa.lpzTitle));
-		}
+		pa.lchIcon = Skin_GetIcon("btn_ok");
+		strncpy_s(pa.lpzTitle, MODNAME"/Yes", SIZEOF(pa.lpzTitle));
 		break;
 	case IDNO:
-		{
-			pa.lchIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"btn_cancel");
-			strncpy_s(pa.lpzTitle, MODNAME"/No", SIZEOF(pa.lpzTitle));
-		}
+		pa.lchIcon = Skin_GetIcon("btn_cancel");
+		strncpy_s(pa.lpzTitle, MODNAME"/No", SIZEOF(pa.lpzTitle));
 		break;
 	}
 }
diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp
index 1d58853c1c..09ba638c9e 100644
--- a/plugins/PackUpdater/Src/PackUpdater.cpp
+++ b/plugins/PackUpdater/Src/PackUpdater.cpp
@@ -74,7 +74,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	mi.cbSize = sizeof(mi);
 	mi.position = -0x7FFFFFFF;
 	mi.flags = CMIF_TCHAR;
-	mi.hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"check_update");
+	mi.hIcon = Skin_GetIcon("check_update");
 	mi.ptszName = _T("Check for pack updates");
 	mi.pszService = MODNAME"/CheckUpdates";
 	Menu_AddMainMenuItem(&mi);
@@ -84,7 +84,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	mi.cbSize = sizeof(mi);
 	mi.position = -0x7FFFFFFF;
 	mi.flags = CMIF_TCHAR;
-	mi.hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"empty_folder");
+	mi.hIcon = Skin_GetIcon("empty_folder");
 	mi.ptszName = _T("Clear pack updates folder");
 	mi.pszService = MODNAME"/EmptyFolder";
 	Menu_AddMainMenuItem(&mi);
-- 
cgit v1.2.3