From 75b1ff75c42644eb36552762652e4b0c9ff071bc Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- protocols/Gadu-Gadu/src/groupchat.cpp | 2 +- protocols/Gadu-Gadu/src/icolib.cpp | 8 ++++---- protocols/Gadu-Gadu/src/links.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index cdee390581..da85d86399 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -207,7 +207,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam) { HANDLE hContact = NULL; if ((uin = atoi(gch->pszUID)) && (hContact = getcontact(uin, 1, 0, NULL))) - CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, (LPARAM)0); + CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0); } char* pszText = mir_t2a(gch->ptszText); netlog("gg_gc_event(): Unhandled event %d, chat %x, uin %d, text \"%s\".", gch->pDest->iType, chat, uin, pszText); diff --git a/protocols/Gadu-Gadu/src/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp index f99540ac76..bc83381e6a 100644 --- a/protocols/Gadu-Gadu/src/icolib.cpp +++ b/protocols/Gadu-Gadu/src/icolib.cpp @@ -77,7 +77,7 @@ HICON LoadIconEx(const char* name, BOOL big) { char szSettingName[100]; mir_snprintf(szSettingName, sizeof(szSettingName), "%s_%s", GGDEF_PROTO, name); - return (HICON)CallService(MS_SKIN2_GETICON, big, (LPARAM)szSettingName); + return Skin_GetIcon(szSettingName, big); } HANDLE GetIconHandle(int iconId) @@ -93,7 +93,7 @@ void ReleaseIconEx(const char* name, BOOL big) { char szSettingName[100]; mir_snprintf(szSettingName, sizeof(szSettingName), "%s_%s", GGDEF_PROTO, name); - CallService(big ? MS_SKIN2_RELEASEICONBIG : MS_SKIN2_RELEASEICON, 0, (LPARAM)szSettingName); + Skin_ReleaseIcon(szSettingName, big); } void WindowSetIcon(HWND hWnd, const char* name) @@ -104,6 +104,6 @@ void WindowSetIcon(HWND hWnd, const char* name) void WindowFreeIcon(HWND hWnd) { - CallService(MS_SKIN2_RELEASEICONBIG, SendMessage(hWnd, WM_SETICON, ICON_BIG, 0), 0); - CallService(MS_SKIN2_RELEASEICON, SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0), 0); + Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0)); + Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0)); } diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index 53770f0bcd..50a8a6ac54 100644 --- a/protocols/Gadu-Gadu/src/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp @@ -84,7 +84,7 @@ static INT_PTR gg_parselink(WPARAM wParam, LPARAM lParam) CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)gginst->hInstanceMenuItem, (LPARAM)&mi); if (mi.hIcon) - CallService(MS_SKIN2_RELEASEICON, (WPARAM)mi.hIcon, 0); + Skin_ReleaseIcon(mi.hIcon); } if (items > 1) -- cgit v1.2.3