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 --- plugins/MirOTR/MirOTR/src/icons.cpp | 15 +++++++++------ plugins/MirOTR/MirOTR/src/mirotrmenu.cpp | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'plugins/MirOTR') diff --git a/plugins/MirOTR/MirOTR/src/icons.cpp b/plugins/MirOTR/MirOTR/src/icons.cpp index c9dd1a10db..181c57e492 100644 --- a/plugins/MirOTR/MirOTR/src/icons.cpp +++ b/plugins/MirOTR/MirOTR/src/icons.cpp @@ -47,16 +47,19 @@ void DeinitIcons() { } HICON LoadIcon(const char* name, int big) { - return ( HICON )CallService( MS_SKIN2_GETICON, big, (LPARAM)name ); + return Skin_GetIcon(name, big); } HANDLE GetIconHandle(const char* name) { - return ( HANDLE )CallService( MS_SKIN2_GETICONHANDLE, 0, (LPARAM)name ); + return Skin_GetIconHandle(name); } -void ReleaseIcon(const char* name, int big) { - CallService( big ? MS_SKIN2_RELEASEICONBIG : MS_SKIN2_RELEASEICON, 0, (LPARAM)name ); +void ReleaseIcon(const char* name, int big) +{ + Skin_ReleaseIcon(name, big); } -void ReleaseIcon(HICON handle, int big) { - CallService( big ? MS_SKIN2_RELEASEICONBIG : MS_SKIN2_RELEASEICON, (WPARAM)handle, 0 ); + +void ReleaseIcon(HICON handle, int big) +{ + Skin_ReleaseIcon(handle); } diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp index 07a874c425..8d6b8512f2 100644 --- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp @@ -220,7 +220,7 @@ void InitMirOTRMenu(void) tmp.CheckService="MirOTRMenuCheckService"; tmp.ExecService="MirOTRMenuExecService"; tmp.name="MirOTRMenu"; - hMirOTRMenuObject=(HANDLE)CallService(MO_CREATENEWMENUOBJECT,(WPARAM)0,(LPARAM)&tmp); + hMirOTRMenuObject=(HANDLE)CallService(MO_CREATENEWMENUOBJECT,0,(LPARAM)&tmp); } OptParam params; -- cgit v1.2.3