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/Updater/services.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/Updater/services.cpp') diff --git a/plugins/Updater/services.cpp b/plugins/Updater/services.cpp index 8d3883b895..3b11ddf850 100644 --- a/plugins/Updater/services.cpp +++ b/plugins/Updater/services.cpp @@ -788,26 +788,26 @@ VOID CALLBACK StartupTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwT HANDLE hEventServicesModulesLoaded2; -int ServicesModulesLoaded(WPARAM wParam, LPARAM lParam) { +int ServicesModulesLoaded(WPARAM wParam, LPARAM lParam) +{ // add main menu item - CLISTMENUITEM menu = {0}; + CLISTMENUITEM mi = {0}; - menu.cbSize=sizeof(menu); - menu.flags = CMIM_ALL | CMIF_ICONFROMICOLIB; - menu.icolibItem = GetIconHandle(I_CHKUPD); + mi.cbSize=sizeof(mi); + mi.flags = CMIM_ALL | CMIF_ICONFROMICOLIB; + mi.icolibItem = GetIconHandle(I_CHKUPD); - menu.pszName = "Check for updates"; - menu.pszService= MS_UPDATE_CHECKFORUPDATES; - menu.position = 500010000; + mi.pszName = "Check for updates"; + mi.pszService= MS_UPDATE_CHECKFORUPDATES; + mi.position = 500010000; -#ifdef MS_CLIST_ADDGROUPMENUITEM - if (ServiceExists(MS_CLIST_ADDGROUPMENUITEM)) { + if (ServiceExists(MS_CLIST_REMOVEGROUPMENUITEM)) { GroupMenuParam gmp = {0}; - hGroupMenuItem = (HANDLE)CallService(MS_CLIST_ADDGROUPMENUITEM,(WPARAM)&gmp,(LPARAM)&menu); + hGroupMenuItem = Menu_AddGroupMenuItem(&gmp, &mi); } -#endif - hMainMenuItem = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&menu); + + hMainMenuItem = Menu_AddMainMenuItem(&mi); hEventServicesModulesLoaded2 = HookEvent(ME_SYSTEM_MODULESLOADED, ServicesModulesLoaded2); startup_timer_id = SetTimer(0, 0, 5000, StartupTimerProc); -- cgit v1.2.3