diff options
| -rw-r--r-- | include/delphi/m_genmenu.inc | 19 | ||||
| -rw-r--r-- | include/delphi/m_helpers.inc | 17 | ||||
| -rw-r--r-- | plugins/Actman/ua/i_uaplaces.inc | 11 | ||||
| -rw-r--r-- | plugins/mRadio/i_tray.inc | 7 |
4 files changed, 18 insertions, 36 deletions
diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc index 634463e4d7..009f06d508 100644 --- a/include/delphi/m_genmenu.inc +++ b/include/delphi/m_genmenu.inc @@ -111,13 +111,6 @@ const // TRAY MENU
{
- add a new item to the tray menus
- wParam=0
- lParam=(LPARAM)(CLISTMENUITEM*)&mi
-}
- MS_CLIST_ADDTRAYMENUITEM:PAnsiChar = 'CList/AddTrayMenuItem';
-
-{
the tray menu is about to be built
wParam=lParam=0
}
@@ -166,18 +159,6 @@ type hLangpack :int;
end;
-function _AddMainMenuItem(mi:PMO_MenuItem) : HGENMENU; stdcall;
- external AppDll name 'Menu_AddMainMenuItem';
-
-function _AddContactMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
- external AppDll name 'Menu_AddContactMenuItem';
-
-function _AddProtoMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
- external AppDll name 'Menu_AddProtoMenuItem';
-
-function _AddStatusMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : 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 2d1cdadeeb..3bad7b4ed7 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -93,6 +93,21 @@ function Crypto_GetProvider(pszName:PAnsiChar):PCRYPTO_PROVIDER; var
hLangpack:int = 0;
+function _AddMainMenuItem(mi:PMO_MenuItem) : HGENMENU; stdcall;
+ external AppDll name 'Menu_AddMainMenuItem';
+
+function _AddContactMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
+ external AppDll name 'Menu_AddContactMenuItem';
+
+function _AddProtoMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
+ external AppDll name 'Menu_AddProtoMenuItem';
+
+function _AddStatusMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
+ external AppDll name 'Menu_AddStatusMenuItem';
+
+function _AddTrayMenuItem(mi:PMO_MenuItem) : HGENMENU; stdcall;
+ external AppDll name 'Menu_AddTrayMenuItem';
+
//----- CListint -----
function IsHContactGroup(h:TMCONTACT):bool;
@@ -417,7 +432,7 @@ end; function Menu_AddTrayMenuItem(mi:PMO_MenuItem):HGENMENU;
begin
mi^.hLangpack:=hLangpack;
- result:=CallService(MS_CLIST_ADDTRAYMENUITEM, 0,LPARAM(mi));
+ result:=_AddTrayMenuItem(mi);
end;
diff --git a/plugins/Actman/ua/i_uaplaces.inc b/plugins/Actman/ua/i_uaplaces.inc index 38531a19a3..6ea5113bc8 100644 --- a/plugins/Actman/ua/i_uaplaces.inc +++ b/plugins/Actman/ua/i_uaplaces.inc @@ -1,14 +1,5 @@ {}
-(*
-const
- MenuServices:array [tMenuType] of pAnsiChar = (
- 'CList/AddMainMenuItem' {MS_CLIST_ADDMAINMENUITEM },
- 'CList/AddContactMenuItem'{MS_CLIST_ADDCONTACTMENUITEM},
- 'CList/AddTrayMenuItem' {MS_CLIST_ADDTRAYMENUITEM },
- 'CList/AddProtoMenuItem' {MS_CLIST_ADDPROTOMENUITEM },
- 'CList/AddStatusMenuItem' {MS_CLIST_ADDSTATUSMENUITEM }
- );
-*)
+
type
tuaMenuRec = record
hMenuRoot:HMENU;
diff --git a/plugins/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc index 7784e42e1f..52967dffaa 100644 --- a/plugins/mRadio/i_tray.inc +++ b/plugins/mRadio/i_tray.inc @@ -254,14 +254,9 @@ end; procedure CreateMIMTrayMenu;
begin
- doTray:=ServiceExists(MS_CLIST_ADDTRAYMENUITEM)<>0;
-
CreateTrayMenu();
MakeStationsMenu();
- if doTray then
- HookEvent(ME_CLIST_PREBUILDTRAYMENU,@TrayPrebuild)
- else
- HookEvent(ME_CLIST_PREBUILDMAINMENU,@TrayPrebuild)
+ HookEvent(ME_CLIST_PREBUILDTRAYMENU,@TrayPrebuild)
end;
procedure RemoveTrayItems;
|