From 59cd198e89782263777c57dcd54704ecb1e10212 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 28 Jun 2015 17:41:48 +0000 Subject: finally CLISTEVENT removed completely git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_clist.inc | 41 ----------------------------------------- include/delphi/m_clistint.inc | 1 - include/delphi/m_genmenu.inc | 40 +++++++++++++++++++++++++++++++++------- include/delphi/m_helpers.inc | 24 ++++++++++++------------ 4 files changed, 45 insertions(+), 61 deletions(-) (limited to 'include/delphi') diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc index 251b5d68f6..9c54fae5d5 100644 --- a/include/delphi/m_clist.inc +++ b/include/delphi/m_clist.inc @@ -46,47 +46,6 @@ const } MS_CLIST_GETSTATUSMODEDESCRIPTION:PAnsiChar = 'CList/GetStatusModeDescription'; -const - CMIF_GRAYED = 1; - CMIF_CHECKED = 2; - CMIF_HIDDEN = 4; // only works on contact menus - CMIF_NOTOFFLINE = 8; // item won't appear for contacts that are offline - CMIF_NOTONLINE = 16; // " online - CMIF_NOTONLIST = 32; // item won't appear on standard contacts - CMIF_NOTOFFLIST = 64; // item won't appear on contacts that have the 'NotOnList' setting - CMIF_UNICODE = 512; // will return TCHAR* instead of AnsiChar* - CMIF_KEEPUNTRANSLATED = 1024; // don't translate a menu item - - CMIF_DEFAULT = 4096; // this menu item is the default one - -type -// WARNING: do not use Translate(TS) for p(t)szName or p(t)szPopupName as they -// are translated by the core, which may lead to double translation. -// Use LPGEN instead which are just dummy wrappers/markers for "lpgen.pl". - PCLISTMENUITEM = ^TCLISTMENUITEM; - TCLISTMENUITEM = record - szName : TChar; // [TRANSLATED-BY-CORE] text of the menu item - flags : dword; // combination of CMIF_* - position : int; // approx position on the menu, lower numbers go nearer the top - hIcon : THANDLE; // icon to put by the item, if this was *not* loaded from - // a resource, you can delete it straight after the call - pszService : PAnsiChar; // name of the service to call when the service is clicked - hParentMenu : THANDLE; // parent menu hamdle - hLangpack : int; // plugin's hLangpack (added automatically) - end; - -function _AddMainMenuItem(mi:PCLISTMENUITEM; hlang:integer) : HGENMENU; stdcall; - external AppDll name 'Menu_AddMainMenuItem'; - -function _AddContactMenuItem(mi:PCLISTMENUITEM; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall; - external AppDll name 'Menu_AddContactMenuItem'; - -function _AddProtoMenuItem(mi:PCLISTMENUITEM; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall; - external AppDll name 'Menu_AddProtoMenuItem'; - -function _AddStatusMenuItem(mi:PCLISTMENUITEM; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall; - external AppDll name 'Menu_AddStatusMenuItem'; - function Menu_BuildContactMenu(hContact:TMCONTACT) : HMENU; stdcall; external AppDll name 'Menu_BuildContactMenu'; diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 64040a535d..33e2ab5d7e 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -520,7 +520,6 @@ type * version 6 additions (0.8.0.x) - accounts *************************************************************************************) pfnGetAccountIndexByPos : function (pos:int):int; cdecl; - pfnConvertMenu: function( clitem:PCLISTMENUITEM; moitem:PMO_MenuItem):int; cdecl; (************************************************************************************* * version 7 additions (0.11.0.x) - extra images diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc index b152cb8106..ad49a1c160 100644 --- a/include/delphi/m_genmenu.inc +++ b/include/delphi/m_genmenu.inc @@ -141,18 +141,44 @@ const SETTING_NOOFFLINEBOTTOM_DEFAULT = 0; +const + CMIF_GRAYED = 1; + CMIF_CHECKED = 2; + CMIF_HIDDEN = 4; // only works on contact menus + CMIF_NOTOFFLINE = 8; // item won't appear for contacts that are offline + CMIF_NOTONLINE = 16; // " online + CMIF_NOTONLIST = 32; // item won't appear on standard contacts + CMIF_NOTOFFLIST = 64; // item won't appear on contacts that have the 'NotOnList' setting + CMIF_UNICODE = 512; // will return TCHAR* instead of AnsiChar* + CMIF_KEEPUNTRANSLATED = 1024; // don't translate a menu item + + CMIF_DEFAULT = 4096; // this menu item is the default one + type PMO_MenuItem = ^TMO_MenuItem; TMO_MenuItem = record - position :int; - root :HGENMENU; - szName :TCHAR; - flags :integer; - hIcon :HICON; // or hIcolibItem:THANDLE; - ownerdata:^pointer; - hLangpack:int; + position :int; + pszService:PAnsiChar; + root :HGENMENU; + szName :TCHAR; + flags :integer; + hIcon :HICON; // or hIcolibItem:THANDLE; + ownerdata :^pointer; + hLangpack :int; end; +function _AddMainMenuItem(mi:PMO_MenuItem; hlang:integer) : HGENMENU; stdcall; + external AppDll name 'Menu_AddMainMenuItem'; + +function _AddContactMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall; + external AppDll name 'Menu_AddContactMenuItem'; + +function _AddProtoMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall; + external AppDll name 'Menu_AddProtoMenuItem'; + +function _AddStatusMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall; + external AppDll name 'Menu_AddStatusMenuItem'; + { This structure passed to CheckService. } diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index 72a0b66103..ac89dd005f 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -52,12 +52,12 @@ function Srmm_GetNthIcon(hContact:TMCONTACT; index:int):pStatusIconData; function SkinAddNewSound(const name, description, defaultFile: PAnsiChar): int_ptr; function SkinPlaySound (const name: PAnsiChar): int_ptr; -function Menu_AddContextFrameMenuItem(mi:PCLISTMENUITEM):HGENMENU; -function Menu_AddMainMenuItem (mi:PCLISTMENUITEM):HGENMENU; -function Menu_AddContactMenuItem (mi:PCLISTMENUITEM):HGENMENU; -function Menu_AddStatusMenuItem (mi:PCLISTMENUITEM):HGENMENU; -function Menu_AddProtoMenuItem (mi:PCLISTMENUITEM):HGENMENU; -function Menu_AddTrayMenuItem (mi:PCLISTMENUITEM):HGENMENU; +function Menu_AddContextFrameMenuItem(mi:PMO_MenuItem):HGENMENU; +function Menu_AddMainMenuItem (mi:PMO_MenuItem):HGENMENU; +function Menu_AddContactMenuItem (mi:PMO_MenuItem):HGENMENU; +function Menu_AddStatusMenuItem (mi:PMO_MenuItem):HGENMENU; +function Menu_AddProtoMenuItem (mi:PMO_MenuItem):HGENMENU; +function Menu_AddTrayMenuItem (mi:PMO_MenuItem):HGENMENU; function UserInfo_AddPage(wParam:WPARAM; odp:POPTIONSDIALOGPAGE):int_ptr; function Options_AddPage (wParam:WPARAM; odp:POPTIONSDIALOGPAGE):int_ptr; @@ -384,33 +384,33 @@ begin end; -function Menu_AddContextFrameMenuItem(mi:PCLISTMENUITEM):HGENMENU; +function Menu_AddContextFrameMenuItem(mi:PMO_MenuItem):HGENMENU; begin mi^.hLangpack:=hLangpack; result:=CallService(MS_CLIST_ADDCONTEXTFRAMEMENUITEM, 0,LPARAM(mi)); end; -function Menu_AddMainMenuItem(mi:PCLISTMENUITEM):HGENMENU; +function Menu_AddMainMenuItem(mi:PMO_MenuItem):HGENMENU; begin result:=_AddMainMenuItem(mi, hLangpack); end; -function Menu_AddContactMenuItem(mi:PCLISTMENUITEM):HGENMENU; +function Menu_AddContactMenuItem(mi:PMO_MenuItem):HGENMENU; begin result:=_AddContactMenuItem(mi, nil, hLangpack); end; -function Menu_AddStatusMenuItem(mi:PCLISTMENUITEM):HGENMENU; +function Menu_AddStatusMenuItem(mi:PMO_MenuItem):HGENMENU; begin result:=_AddStatusMenuItem(mi, nil, hLangpack); end; -function Menu_AddProtoMenuItem(mi:PCLISTMENUITEM):HGENMENU; +function Menu_AddProtoMenuItem(mi:PMO_MenuItem):HGENMENU; begin result:=_AddProtoMenuItem(mi, nil, hLangpack); end; -function Menu_AddTrayMenuItem(mi:PCLISTMENUITEM):HGENMENU; +function Menu_AddTrayMenuItem(mi:PMO_MenuItem):HGENMENU; begin mi^.hLangpack:=hLangpack; result:=CallService(MS_CLIST_ADDTRAYMENUITEM, 0,LPARAM(mi)); -- cgit v1.2.3