From 4ee8ae99f601d55f0722acf3e6c8c7a8bc85755e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 29 Jun 2015 19:39:23 +0000 Subject: duplicate hLangpack assignment removed git-svn-id: http://svn.miranda-ng.org/main/trunk@14441 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_clist.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/m_clist.h b/include/m_clist.h index 64105858b8..b519ec8d9b 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -133,12 +133,11 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddProtoMenuItem(TMO_MenuItem *mi, const cha ///////////////////////////////////////////////////////////////////////////////////////// // GROUP MENU -typedef struct +struct GroupMenuParam { int wParam; int lParam; -} -GroupMenuParam, *lpGroupMenuParam; +}; // builds the Group menu // wParam=lParam=0 @@ -146,12 +145,11 @@ GroupMenuParam, *lpGroupMenuParam; #define MS_CLIST_MENUBUILDGROUP "CList/MenuBuildGroup" // add a new item to the Group menus -// wParam=lpGroupMenuParam, params to call when exec menuitem +// wParam=GroupMenuParam*, params to call when exec menuitem // lParam=(LPARAM)(TMO_MenuItem*)&mi -__forceinline HGENMENU Menu_AddGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuItem *mi) +__forceinline HGENMENU Menu_AddGroupMenuItem(GroupMenuParam *gmp, TMO_MenuItem *mi) { - mi->hLangpack = hLangpack; return (HGENMENU)CallService("CList/AddGroupMenuItem", (WPARAM)gmp, (LPARAM)mi); } @@ -168,12 +166,11 @@ __forceinline HGENMENU Menu_AddGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuItem #define MS_CLIST_MENUBUILDSUBGROUP "CList/MenuBuildSubGroup" // add a new item to the SubGroup menus -// wParam=lpGroupMenuParam, params to call when exec menuitem +// wParam=GroupMenuParam*, params to call when exec menuitem // lParam=(LPARAM)(TMO_MenuItem*)&mi -__forceinline HGENMENU Menu_AddSubGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuItem *mi) +__forceinline HGENMENU Menu_AddSubGroupMenuItem(GroupMenuParam *gmp, TMO_MenuItem *mi) { - mi->hLangpack = hLangpack; return (HGENMENU)CallService("CList/AddSubGroupMenuItem", (WPARAM)gmp, (LPARAM)mi); } @@ -195,7 +192,6 @@ __forceinline HGENMENU Menu_AddSubGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuIt __forceinline HGENMENU Menu_AddTrayMenuItem(TMO_MenuItem *mi) { - mi->hLangpack = hLangpack; return (HGENMENU)CallService("CList/AddTrayMenuItem", 0, (LPARAM)mi); } @@ -294,7 +290,7 @@ typedef struct { LPARAM lParam; //caller defined char *pszService; //name of the service to call on activation union { - char *pszTooltip; //short description of the event to display as a + char *pszTooltip; //short description of the event to display as a TCHAR *ptszTooltip; //tooltip on the system tray }; } CLISTEVENT; -- cgit v1.2.3