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/AimOscar/src/proto.cpp | 2 +- protocols/AimOscar/src/theme.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/AimOscar') diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp index 09f7ba4ab1..17c8fc3a88 100644 --- a/protocols/AimOscar/src/proto.cpp +++ b/protocols/AimOscar/src/proto.cpp @@ -758,7 +758,7 @@ void __cdecl CAimProto::get_online_msg_thread(void* arg) sendBroadcast(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)dbv.ptszVal); DBFreeVariant(&dbv); } - else sendBroadcast(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)0); + else sendBroadcast(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, 0); } HANDLE __cdecl CAimProto::GetAwayMsg(HANDLE hContact) diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index 085c7335d7..cec3df5708 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -101,7 +101,7 @@ HICON LoadIconEx(const char* name, bool big) { char szSettingName[100]; mir_snprintf(szSettingName, sizeof(szSettingName), "AIM_%s", name); - return (HICON)CallService(MS_SKIN2_GETICON, big, (LPARAM)szSettingName); + return Skin_GetIcon(szSettingName, big); } HANDLE GetIconHandle(const char* name) @@ -116,7 +116,7 @@ void ReleaseIconEx(const char* name, bool big) { char szSettingName[100]; mir_snprintf(szSettingName, sizeof(szSettingName ), "%s_%s", "AIM", name); - CallService(big ? MS_SKIN2_RELEASEICONBIG : MS_SKIN2_RELEASEICON, 0, (LPARAM)szSettingName); + Skin_ReleaseIcon(szSettingName, big); } void WindowSetIcon(HWND hWnd, const char* name) @@ -127,8 +127,8 @@ void WindowSetIcon(HWND hWnd, const char* name) void WindowFreeIcon(HWND hWnd) { - CallService(MS_SKIN2_RELEASEICON, 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)); } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3