From 3f9882178018afbe9aaaba1f4461f3fc75493260 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 15 Jun 2015 14:23:02 +0000
Subject: MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct
 function calls

git-svn-id: http://svn.miranda-ng.org/main/trunk@14176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdfile/src/file.cpp        | 6 +++---
 src/core/stdfile/src/filexferdlg.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/core/stdfile')

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 58db4a89e9..d6a28d2072 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -127,7 +127,7 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam)
 		cle.ptszTooltip = szTooltip;
 
 		cle.flags |= CLEF_TCHAR;
-		cle.hIcon = LoadSkinIcon(SKINICON_EVENT_FILE);
+		cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_FILE);
 		cle.pszService = "SRFile/RecvFile";
 		CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);
 	}
@@ -338,7 +338,7 @@ static int SRFileModulesLoaded(WPARAM, LPARAM)
 {
 	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.position = -2000020000;
-	mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_FILE);
+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);
 	mi.pszName = LPGEN("&File");
 	mi.pszService = MS_FILE_SENDFILE;
 	hSRFileMenuItem = Menu_AddContactMenuItem(&mi);
@@ -435,7 +435,7 @@ int LoadSendRecvFileModule(void)
 	CreateServiceFunction("FtMgr/Show", FtMgrShowCommand);
 
 	CLISTMENUITEM mi = { sizeof(mi) };
-	mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_FILE);
+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);
 	mi.position = 1900000000;
 	mi.pszName = LPGEN("File &transfers...");
 	mi.pszService = "FtMgr/Show"; //MS_PROTO_SHOWFTMGR;
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index 137f80f23b..ac01125118 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -154,7 +154,7 @@ static void SetFilenameControls(HWND hwndDlg, FileDlgData *dat, PROTOFILETRANSFE
 	}
 	else {
 		mir_tstrncpy(msg, pcli->pfnGetContactDisplayName(fts->hContact, 0), SIZEOF(msg));
-		HICON hIcon = LoadSkinIcon(SKINICON_OTHER_DOWNARROW);
+		HICON hIcon = Skin_LoadIcon(SKINICON_OTHER_DOWNARROW);
 		dat->hIcon = CopyIcon(hIcon);
 		IcoLib_ReleaseIcon(hIcon, NULL);
 	}
@@ -274,7 +274,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		{
 			char *szProto = GetContactProto(dat->hContact);
 			WORD status = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_ONLINE);
-			SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinnedProtoIcon(szProto, status));
+			SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadProtoIcon(szProto, status));
 		}
 
 		SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Contact menu"), 0);
-- 
cgit v1.2.3