From ee3100701b64a1a34e8e5b3069219c7c5a201d8a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 29 Jun 2015 19:30:51 +0000
Subject: - 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
---
 include/delphi/m_genmenu.inc |  8 ++++----
 include/delphi/m_helpers.inc | 12 ++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'include/delphi')

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;
-- 
cgit v1.2.3