From be616d81bdaf8fd4ae61b0a145fb81bbdf467994 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Jun 2015 22:03:02 +0000 Subject: YEEHAW! CLISTMENUITEM::pszPopupName also died git-svn-id: http://svn.miranda-ng.org/main/trunk@14404 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_clist.h | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'include/m_clist.h') diff --git a/include/m_clist.h b/include/m_clist.h index 4bc8d25709..7314f9f303 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -88,28 +88,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CLISTMENUITEM { union { - char* pszName; //[TRANSLATED-BY-CORE] text of the menu item - TCHAR* ptszName; //Unicode text of the menu item + char* pszName; // [TRANSLATED-BY-CORE] text of the menu item + TCHAR* ptszName; // Unicode text of the menu item }; - DWORD flags; //set of CMIF_* flags - int position; //approx position on the menu. lower numbers go nearer the top + DWORD flags; // set of CMIF_* flags + int position; // approx position on the menu. lower numbers go nearer the top union { - HICON hIcon; //icon to put by the item. If this was not loaded from - //a resource, you can delete it straight after the call - HANDLE icolibItem; //set CMIF_ICONFROMICOLIB to pass this value + HICON hIcon; // icon to put by the item. If this was not loaded from + // a resource, you can delete it straight after the call + HANDLE icolibItem; // set CMIF_ICONFROMICOLIB to pass this value }; - char* pszService; //name of service to call when the item gets selected - union { - char* pszPopupName; //[TRANSLATED-BY-CORE] name of the popup menu that this item is on. If this - TCHAR* ptszPopupName; //is NULL the item is on the root of the menu - HGENMENU hParentMenu; // valid if CMIF_ROOTHANDLE is set. NULL or (HGENMENU)-1 means the root menu - }; - - char *pszContactOwner; //contact menus only. The protocol module that owns - //the contacts to which this menu item applies. NULL if it - //applies to all contacts. If it applies to multiple but not all - //protocols, add multiple menu items or use ME_CLIST_PREBUILDCONTACTMENU - int hLangpack; //plugin's hLangpack (added automatically) + char* pszService; // name of service to call when the item gets selected + HGENMENU hParentMenu; // HGENMENU_ROOT or NULL means the root menu + + char *pszContactOwner; // contact menus only. The protocol module that owns + // the contacts to which this menu item applies. NULL if it + // applies to all contacts. If it applies to multiple but not all + // protocols, add multiple menu items or use ME_CLIST_PREBUILDCONTACTMENU + int hLangpack; // plugin's hLangpack (added automatically) }; #define CMIF_GRAYED 1 @@ -119,7 +115,6 @@ struct CLISTMENUITEM #define CMIF_NOTONLINE 16 // " online #define CMIF_NOTONLIST 32 //item won't appear on standard contacts #define CMIF_NOTOFFLIST 64 //item won't appear on contacts that have the 'NotOnList' setting -#define CMIF_ROOTHANDLE 384 //means that hParentMenu member is set #define CMIF_UNICODE 512 //will return TCHAR* instead of char* #if defined(_UNICODE) @@ -129,7 +124,6 @@ struct CLISTMENUITEM #endif #define CMIF_KEEPUNTRANSLATED 1024 // don't translate a menu item -//#define CMIF_ICONFROMICOLIB 2048 // use icolibName instead of hIcon, unused #define CMIF_DEFAULT 4096 // this menu item is the default one __forceinline HGENMENU Menu_AddMainMenuItem(CLISTMENUITEM *mi) -- cgit v1.2.3