diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-29 19:30:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-29 19:30:51 +0000 |
| commit | ee3100701b64a1a34e8e5b3069219c7c5a201d8a (patch) | |
| tree | 65ae99da9575d2611734482dcedec21bf7f186db /include/delphi | |
| parent | cadd3f86302d30d6d6a2e4af63a7a50f0dd1f1cb (diff) | |
- unified menu creation using wrapper class CMenuItem;
- duplicated hLangpack field removed from TMO_IntMenuItem;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14440 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/delphi')
| -rw-r--r-- | include/delphi/m_genmenu.inc | 8 | ||||
| -rw-r--r-- | include/delphi/m_helpers.inc | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc index ad49a1c160..6246276244 100644 --- a/include/delphi/m_genmenu.inc +++ b/include/delphi/m_genmenu.inc @@ -167,16 +167,16 @@ type hLangpack :int;
end;
-function _AddMainMenuItem(mi:PMO_MenuItem; hlang:integer) : HGENMENU; stdcall;
+function _AddMainMenuItem(mi:PMO_MenuItem) : HGENMENU; stdcall;
external AppDll name 'Menu_AddMainMenuItem';
-function _AddContactMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall;
+function _AddContactMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
external AppDll name 'Menu_AddContactMenuItem';
-function _AddProtoMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall;
+function _AddProtoMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
external AppDll name 'Menu_AddProtoMenuItem';
-function _AddStatusMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar; hlang:integer) : HGENMENU; stdcall;
+function _AddStatusMenuItem(mi:PMO_MenuItem; pszProto:PAnsiChar) : HGENMENU; stdcall;
external AppDll name 'Menu_AddStatusMenuItem';
{
diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index ac89dd005f..2d1cdadeeb 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -392,22 +392,26 @@ end; function Menu_AddMainMenuItem(mi:PMO_MenuItem):HGENMENU;
begin
- result:=_AddMainMenuItem(mi, hLangpack);
+ mi^.hLangpack:=hLangpack;
+ result:=_AddMainMenuItem(mi);
end;
function Menu_AddContactMenuItem(mi:PMO_MenuItem):HGENMENU;
begin
- result:=_AddContactMenuItem(mi, nil, hLangpack);
+ mi^.hLangpack:=hLangpack;
+ result:=_AddContactMenuItem(mi, nil);
end;
function Menu_AddStatusMenuItem(mi:PMO_MenuItem):HGENMENU;
begin
- result:=_AddStatusMenuItem(mi, nil, hLangpack);
+ mi^.hLangpack:=hLangpack;
+ result:=_AddStatusMenuItem(mi, nil);
end;
function Menu_AddProtoMenuItem(mi:PMO_MenuItem):HGENMENU;
begin
- result:=_AddProtoMenuItem(mi, nil, hLangpack);
+ mi^.hLangpack:=hLangpack;
+ result:=_AddProtoMenuItem(mi, nil);
end;
function Menu_AddTrayMenuItem(mi:PMO_MenuItem):HGENMENU;
|