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/Alarms/options.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'plugins/Alarms/options.cpp') diff --git a/plugins/Alarms/options.cpp b/plugins/Alarms/options.cpp index 4b6076e6bb..9f2b9d1222 100644 --- a/plugins/Alarms/options.cpp +++ b/plugins/Alarms/options.cpp @@ -696,22 +696,20 @@ void AddMenuItem() { if (hMainMenuItem) return; - CLISTMENUITEM menu = {0}; - - menu.cbSize=sizeof(menu); - menu.flags = CMIM_ALL; - menu.hIcon=hIconMenuSet; - - menu.pszName = Translate("Set Alarm"); - menu.pszService= MODULE "/NewAlarm"; - menu.position = 500010000; + CLISTMENUITEM mi = {0}; + mi.cbSize = sizeof(mi); + mi.flags = CMIM_ALL; + mi.hIcon = hIconMenuSet; + mi.pszName = "Set Alarm"; + mi.pszService = MODULE "/NewAlarm"; + mi.position = 500010000; if (!ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) - menu.pszPopupName = Translate("Alarms"); - if (ServiceExists(MS_CLIST_ADDGROUPMENUITEM)) { + mi.pszPopupName = "Alarms"; + if (ServiceExists(MS_CLIST_REMOVEGROUPMENUITEM)) { GroupMenuParam gmp = {0}; - hGroupMenuItem = (HANDLE)CallService(MS_CLIST_ADDGROUPMENUITEM,(WPARAM)&gmp,(LPARAM)&menu); + hGroupMenuItem = Menu_AddGroupMenuItem(&gmp, &mi); } - hMainMenuItem = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&menu); + hMainMenuItem = Menu_AddMainMenuItem(&mi); } /////////////////////// -- cgit v1.2.3