From e58823d961a630eb62e60d2ccb443761ba5f1704 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Jun 2012 15:51:34 +0000 Subject: - all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs. - massive cleanup of the menu-related code git-svn-id: http://svn.miranda-ng.org/main/trunk@410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SimpleStatusMsg/awaymsg.cpp | 6 +++--- plugins/SimpleStatusMsg/main.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/SimpleStatusMsg') diff --git a/plugins/SimpleStatusMsg/awaymsg.cpp b/plugins/SimpleStatusMsg/awaymsg.cpp index 062b702254..4932f475a1 100644 --- a/plugins/SimpleStatusMsg/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/awaymsg.cpp @@ -508,7 +508,7 @@ int LoadAwayMsgModule(void) mi.position = -2000005000; mi.ptszName = LPGENT("Re&ad Away Message"); mi.pszService = MS_AWAYMSG_SHOWAWAYMSG; - hAwayMsgMenuItem = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi); + hAwayMsgMenuItem = Menu_AddContactMenuItem(&mi); mi.flags |= CMIF_ICONFROMICOLIB; CreateServiceFunctionEx(MS_SIMPLESTATUSMSG_COPYMSG, CopyAwayMsgCommand); @@ -516,14 +516,14 @@ int LoadAwayMsgModule(void) mi.icolibItem = GetIconHandle(IDI_COPY); mi.ptszName = LPGENT("Copy Away Message"); mi.pszService = MS_SIMPLESTATUSMSG_COPYMSG; - hCopyMsgMenuItem = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi); + hCopyMsgMenuItem = Menu_AddContactMenuItem(&mi); CreateServiceFunctionEx(MS_SIMPLESTATUSMSG_GOTOURLMSG, GoToURLMsgCommand); mi.position = -2000007000; mi.icolibItem = GetIconHandle(IDI_GOTOURL); mi.ptszName = LPGENT("&Go to URL in Away Message"); mi.pszService = MS_SIMPLESTATUSMSG_GOTOURLMSG; - hGoToURLMenuItem = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi); + hGoToURLMenuItem = Menu_AddContactMenuItem(&mi); HookEventEx(ME_CLIST_PREBUILDCONTACTMENU, AwayMsgPreBuildMenu); diff --git a/plugins/SimpleStatusMsg/main.cpp b/plugins/SimpleStatusMsg/main.cpp index def96c25c3..4cdaee3023 100644 --- a/plugins/SimpleStatusMsg/main.cpp +++ b/plugins/SimpleStatusMsg/main.cpp @@ -1711,7 +1711,7 @@ static int ChangeStatusMsgPrebuild(WPARAM wParam, LPARAM lParam) mi.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT; mi.ptszName = LPGENT("Status Message..."); mi.position = 2000200000; - CallService(MS_CLIST_ADDSTATUSMENUITEM, 0, (LPARAM)&mi); + Menu_AddStatusMenuItem(&mi); mi.popupPosition = 500084000; mi.position = 2000040000; @@ -1746,7 +1746,7 @@ static int ChangeStatusMsgPrebuild(WPARAM wParam, LPARAM lParam) mi.ptszPopupName = szBuffer; } else mi.ptszPopupName = pa[i]->tszAccountName; - hProtoStatusMenuItem[i] = (HANDLE)CallService(MS_CLIST_ADDSTATUSMENUITEM, 0, (LPARAM)&mi); + hProtoStatusMenuItem[i] = Menu_AddStatusMenuItem(&mi); } return 0; -- cgit v1.2.3