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 --- src/modules/clist/clistmenus.cpp | 10 +++++----- src/modules/clist/genmenu.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules/clist') diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index 364461d688..9468292670 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -201,10 +201,10 @@ static INT_PTR BuildMainMenu(WPARAM, LPARAM) ListParam param = { 0 }; param.MenuObjectHandle = hMainMenuObject; - NotifyEventHooks(hPreBuildMainMenuEvent, (WPARAM)0, (LPARAM)0); + NotifyEventHooks(hPreBuildMainMenuEvent, 0, 0); CallService(MO_BUILDMENU, (WPARAM)hMainMenu, (LPARAM)¶m); - DrawMenuBar((HWND)CallService("CLUI/GetHwnd", (WPARAM)0, (LPARAM)0)); + DrawMenuBar((HWND)CallService("CLUI/GetHwnd", 0, 0)); return (INT_PTR)hMainMenu; } @@ -842,7 +842,7 @@ void RebuildMenuOrder(void) tmp.CheckService = "StatusMenuCheckService"; tmp.name = "StatusMenu"; - hStatusMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, (WPARAM)0, (LPARAM)&tmp); + hStatusMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, 0, (LPARAM)&tmp); MO_SetOptionsMenuObject(hStatusMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, (INT_PTR)"CLISTMENUS/FreeOwnerDataStatusMenu"); hStatusMainMenuHandles = (PMO_IntMenuItem*)mir_calloc(SIZEOF(statusModeList) * sizeof(PMO_IntMenuItem*)); @@ -1324,7 +1324,7 @@ void InitCustomMenus(void) tmp.CheckService = NULL; tmp.ExecService = "MainMenuExecService"; tmp.name = "MainMenu"; - hMainMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, (WPARAM)0, (LPARAM)&tmp); + hMainMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, 0, (LPARAM)&tmp); } MO_SetOptionsMenuObject(hMainMenuObject, OPT_USERDEFINEDITEMS, TRUE); @@ -1337,7 +1337,7 @@ void InitCustomMenus(void) tmp.CheckService = "ContactMenuCheckService"; tmp.ExecService = "ContactMenuExecService"; tmp.name = "ContactMenu"; - hContactMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, (WPARAM)0, (LPARAM)&tmp); + hContactMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT, 0, (LPARAM)&tmp); } MO_SetOptionsMenuObject(hContactMenuObject, OPT_USERDEFINEDITEMS, TRUE); diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp index e68463c781..02ffb598ed 100644 --- a/src/modules/clist/genmenu.cpp +++ b/src/modules/clist/genmenu.cpp @@ -1085,7 +1085,7 @@ static int MO_RegisterIcon(PMO_IntMenuItem pmi, void*) pmi->hIcolibItem = IcoLib_AddNewIcon(0, &sid); Safe_DestroyIcon(hIcon); - if (hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)iconame)) { + if (hIcon = Skin_GetIcon(iconame)) { ImageList_ReplaceIcon(pmi->parent->m_hMenuIcons, pmi->iconId, hIcon); IcoLib_ReleaseIcon(hIcon, 0); } -- cgit v1.2.3