From 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 14 Jun 2015 13:17:26 +0000 Subject: - all icolib services removed; - IcoLib_* functions are bound directly to the code git-svn-id: http://svn.miranda-ng.org/main/trunk@14161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/globals.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/Scriver/src/globals.cpp') diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index 8a35da30a5..dde38e5739 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -176,14 +176,14 @@ int ImageList_AddIcon_Ex(HIMAGELIST hIml, int id) { HICON hIcon = LoadSkinnedIcon(id); int res = ImageList_AddIcon(hIml, hIcon); - Skin_ReleaseIcon(hIcon); + IcoLib_ReleaseIcon(hIcon); return res; } int ImageList_AddIcon_Ex2(HIMAGELIST hIml, HICON hIcon) { int res = ImageList_AddIcon(hIml, hIcon); - Skin_ReleaseIcon(hIcon); + IcoLib_ReleaseIcon(hIcon); return res; } @@ -191,7 +191,7 @@ int ImageList_ReplaceIcon_Ex(HIMAGELIST hIml, int nIndex, int id) { HICON hIcon = LoadSkinnedIcon(id); int res = ImageList_ReplaceIcon(hIml, nIndex, hIcon); - Skin_ReleaseIcon(hIcon); + IcoLib_ReleaseIcon(hIcon); return res; } @@ -199,22 +199,22 @@ int ImageList_AddIcon_ProtoEx(HIMAGELIST hIml, const char* szProto, int status) { HICON hIcon = LoadSkinnedProtoIcon(szProto, status); int res = ImageList_AddIcon(hIml, hIcon); - Skin_ReleaseIcon(hIcon); + IcoLib_ReleaseIcon(hIcon); return res; } void ReleaseIcons() { - Skin_ReleaseIcon(g_dat.hMsgIcon); - Skin_ReleaseIcon(g_dat.hMsgIconBig); - Skin_ReleaseIcon(g_dat.hIconChatBig); + IcoLib_ReleaseIcon(g_dat.hMsgIcon); + IcoLib_ReleaseIcon(g_dat.hMsgIconBig); + IcoLib_ReleaseIcon(g_dat.hIconChatBig); } HICON GetCachedIcon(const char *name) { for (int i = 0; i < SIZEOF(iconList); i++) if (!mir_strcmp(iconList[i].szName, name)) - return Skin_GetIconByHandle(iconList[i].hIcolib); + return IcoLib_GetIconByHandle(iconList[i].hIcolib); return NULL; } @@ -225,7 +225,7 @@ void LoadGlobalIcons() g_dat.hMsgIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); g_dat.hMsgIconBig = LoadSkinnedIconBig(SKINICON_EVENT_MESSAGE); - g_dat.hIconChatBig = Skin_GetIcon("chat_window", true); + g_dat.hIconChatBig = IcoLib_GetIcon("chat_window", true); ImageList_RemoveAll(g_dat.hButtonIconList); ImageList_RemoveAll(g_dat.hChatButtonIconList); -- cgit v1.2.3