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/Popup/src/icons.cpp         | 4 ++--
 plugins/Popup/src/notifications.cpp | 2 +-
 plugins/Popup/src/opt_skins.cpp     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/Popup/src')

diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp
index b92df47a6b..32594dd464 100644
--- a/plugins/Popup/src/icons.cpp
+++ b/plugins/Popup/src/icons.cpp
@@ -89,7 +89,7 @@ static ICODESC icoDesc[] =
  **/
 HICON IcoLib_GetIcon(LPCSTR pszIcon, bool big)
 {
-	return (pszIcon) ? (HICON)CallService(MS_SKIN2_GETICON, (WPARAM)big, (LPARAM) pszIcon) : NULL;
+	return (pszIcon) ? Skin_GetIcon(pszIcon, big) : NULL;
 }
 
 void InitIcons()
@@ -108,7 +108,7 @@ void InitIcons()
 
 		if(icoDesc[i].idResource==0){
 			//use icon from icon lib
-			sid.hDefaultIcon = (HICON)CallService(MS_SKIN2_GETICON,0 , (LPARAM)icoDesc[i].pszIcon);
+			sid.hDefaultIcon = Skin_GetIcon(icoDesc[i].pszIcon);
 			sid.ptszDefaultFile = NULL;
 			sid.iDefaultIndex = 0;
 		}else{
diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp
index c52ff490d2..9b5b953315 100644
--- a/plugins/Popup/src/notifications.cpp
+++ b/plugins/Popup/src/notifications.cpp
@@ -281,7 +281,7 @@ void FillNotificationData(POPUPDATA2 *ppd, DWORD *disableWhen)
 
 	char setting[MAXMODULELABELLENGTH];
 	mir_snprintf(setting, sizeof(setting), "%s_%s_%s", MODULNAME, ptd->notification.lpzGroup, ptd->notification.lpzName);
-	ppd->lchIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)setting);
+	ppd->lchIcon = Skin_GetIcon(setting);
 }
 
 bool IsValidNotification(HANDLE hNotification)
diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp
index a6083564cc..50656f7239 100644
--- a/plugins/Popup/src/opt_skins.cpp
+++ b/plugins/Popup/src/opt_skins.cpp
@@ -477,8 +477,8 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 								hwndDlg,
 								IDC_SKINLIST,
 								LB_GETITEMDATA,
-								(WPARAM)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL,(WPARAM)0,(LPARAM)0),
-								(LPARAM)0));
+								(WPARAM)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL,0,0),
+								0));
 							const PopupSkin *skin = 0;
 							if (skin = skins.getSkin(PopUpOptions.SkinPack)) {
 								mir_free(PopUpOptions.SkinPack);
-- 
cgit v1.2.3