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/Sessions/Src/Main.cpp    |  8 ++++----
 plugins/Sessions/Src/Options.cpp | 12 ++++++------
 plugins/Sessions/Src/Utils.cpp   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins/Sessions')

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index 2aaa3384fb..630f9bb1f0 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -298,7 +298,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
 				if(session_list_recovered[0])
 					ses_count=256;
 
-				SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, (WPARAM)0, 0);
+				SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, 0, 0);
 				LoadPosition(hdlg, "LoadDlg");
 				if(StartUp)
 					SetTimer(hdlg, TIMERID_SHOW, iDelay, NULL);
@@ -369,7 +369,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
 						if(LoadSessionToCombobox(hdlg,1,255,"UserSessionDsc",ses_limit)==0 && ses_count!=0)
 							ses_count=0;
 
-						SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, (WPARAM)0, 0);
+						SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, 0, 0);
 
 					}
 					else if (ses_count>=ses_limit)
@@ -387,7 +387,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
 
 						if(session_list_recovered[0]) ses_count=256;
 
-						SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, (WPARAM)0, 0);
+						SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, 0, 0);
 					}
 					else
 					{
@@ -402,7 +402,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
 
 						if(session_list_recovered[0]) ses_count=256;
 
-						SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, (WPARAM)0, 0);
+						SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, 0, 0);
 					}
 					if (SendDlgItemMessage(hdlg, IDC_LIST, CB_GETCOUNT, 0, 0))
 						EnableWindow(GetDlgItem(hdlg,IDC_SESSDEL),TRUE);
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp
index c9c9c9eeba..7c6d545225 100644
--- a/plugins/Sessions/Src/Options.cpp
+++ b/plugins/Sessions/Src/Options.cpp
@@ -177,8 +177,8 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 			g_opHdlg=hdlg;
 			bOptionsInit=TRUE;
 			TranslateDialogDefault(hdlg); 
-			hMarked=(HICON)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)hibChecked);
-			hNotMarked=(HICON)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)hibNotChecked);
+			hMarked = Skin_GetIconByHandle(hibChecked);
+			hNotMarked = Skin_GetIconByHandle(hibNotChecked);
 			
 			hIcon=(bChecked=IsMarkedUserDefSession(opses_count))?hMarked:hNotMarked;
 
@@ -234,10 +234,10 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 			else if (exitmode==2) CheckDlgButton(hdlg,IDC_REXSAVE,BST_CHECKED);
 
 			LoadSessionToCombobox (hdlg,1,255,"UserSessionDsc",0);
-			if(SendDlgItemMessage(hdlg, IDC_LIST, CB_GETCOUNT, (WPARAM)0, 0))
+			if(SendDlgItemMessage(hdlg, IDC_LIST, CB_GETCOUNT, 0, 0))
 			{
 				EnableWindow(GetDlgItem(hdlg,IDC_EDIT),TRUE);
-				SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, (WPARAM)0, 0);
+				SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, 0, 0);
 				if (!OpLoadSessionContacts(0,opses_count))
 					EnableWindow(GetDlgItem(hdlg,IDC_DEL),FALSE);
 			}
@@ -451,10 +451,10 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 
 				opses_count=0;
 
-				if(SendDlgItemMessage(hdlg, IDC_LIST, CB_GETCOUNT, (WPARAM)0, 0))
+				if(SendDlgItemMessage(hdlg, IDC_LIST, CB_GETCOUNT, 0, 0))
 				{
 					EnableWindow(GetDlgItem(hdlg,IDC_EDIT),TRUE);
-					SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, (WPARAM)0, 0);
+					SendDlgItemMessage(hdlg, IDC_LIST, CB_SETCURSEL, 0, 0);
 					if (!OpLoadSessionContacts(0,opses_count))
 						EnableWindow(GetDlgItem(hdlg,IDC_DEL),FALSE);
 				}
diff --git a/plugins/Sessions/Src/Utils.cpp b/plugins/Sessions/Src/Utils.cpp
index 8ac041e7e9..93e7849c2c 100644
--- a/plugins/Sessions/Src/Utils.cpp
+++ b/plugins/Sessions/Src/Utils.cpp
@@ -441,7 +441,7 @@ int LoadSessionToCombobox (HWND hdlg,BOOL mode,int iLimit,char* pszSetting,int i
 			else
 			{
 				SendDlgItemMessage(hdlg, IDC_LIST, CB_INSERTSTRING, 0, (LPARAM)pszBuffer);
-				SendDlgItemMessage(hdlg, IDC_LIST, CB_SETITEMDATA, (WPARAM)0, (LPARAM) (DWORD)i+iFirstNum);
+				SendDlgItemMessage(hdlg, IDC_LIST, CB_SETITEMDATA, 0, (LPARAM) (DWORD)i+iFirstNum);
 			}
 			mir_free(pszBuffer);
 			pszBuffer=NULL;
-- 
cgit v1.2.3