From 7d3d5e16b4e5378a751576095771c2a75b7276fb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 23 Jun 2015 12:43:36 +0000
Subject: - Menu_ConfigureItem replaced MO_SETOPTIONSMENUITEM; -
 Menu_ConfigureObject replaced MO_SETOPTIONSMENUOBJECT; -
 TIntMenuObject::hotkey replaced TMenuObject::hotkey

git-svn-id: http://svn.miranda-ng.org/main/trunk@14349 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 include/delphi/m_clist.inc   |  1 -
 include/delphi/m_genmenu.inc | 50 +++++++++++++++-----------------------------
 2 files changed, 17 insertions(+), 34 deletions(-)

(limited to 'include/delphi')

diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc
index cf5df8da4b..c92f468a82 100644
--- a/include/delphi/m_clist.inc
+++ b/include/delphi/m_clist.inc
@@ -64,7 +64,6 @@ type
 		// or hParentMenu:HGENMENU - valid if CMIF_ROOTHANDLE is set. NULL or (HGENMENU)-1 means the root menu
     popupPosition  : int;     // position of the popup menu on the root menu, ignored
                               // if pszPopupName is NULL(0) or if the popup menu already exists
-    hotKey         : dword;   // keyboard accelerator, same as lParam of WM_HOTKEY, 0 for none
     pszContactOwner: PAnsiChar;   // contact menus only, the protocol module that owns
                               // the contacts to which this to which this menu item
                               // applies, NULL(0) if it applies to all contacts.
diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc
index a8d54d8edb..e17a9a2a56 100644
--- a/include/delphi/m_genmenu.inc
+++ b/include/delphi/m_genmenu.inc
@@ -200,7 +200,6 @@ type
     szName   :TCHAR;
     flags    :integer;
     hIcon    :HICON;   // or hIcolibItem:THANDLE;
-    hotKey   :dword;
     ownerdata:^pointer;
     hLangpack:int;
   end;
@@ -370,54 +369,39 @@ const
   MO_MEASUREMENUITEM:PAnsiChar = 'MO/MeasureMenuItem';
 
 {
-  set uniq name to menuitem(used to store it in database when enabled OPT_USERDEFINEDITEMS)
-}
-  OPT_MENUITEMSETUNIQNAME = 1;
-{
-  Set FreeService for menuobject. When freeing menuitem it will be called with
-  wParam=MenuItemHandle
-  lParam=mi.ownerdata
-}
-  OPT_MENUOBJECT_SET_FREE_SERVICE = 2;
-
-{
-  Set onAddService for menuobject.
+  sets an option for the whole menu object
+  returns TRUE if it processed the command, FALSE otherwise
 }
-  OPT_MENUOBJECT_SET_ONADD_SERVICE = 3;
 
+const 
+  OPT_MENUITEMSETUNIQNAME = 1; // sets uniq name to menuitem(used to store it in database when enabled OPT_USERDEFINEDITEMS)
+  OPT_MENUOBJECT_SET_FREE_SERVICE = 2; // sets FreeService for menuobject.
+  OPT_MENUOBJECT_SET_ONADD_SERVICE = 3; // sets onAddService for menuobject.
   OPT_MENUOBJECT_SET_CHECK_SERVICE = 4;
 
-//enable ability user to edit menuitems via options page.
-  OPT_USERDEFINEDITEMS = 1;
-
-type
-  POptParam = ^TOptParam;
-  TOptParam = record
-    Handle :THANDLE;
-    Setting:int;
-    Value  :int_ptr;
-  end;
+function Menu_ConfigureObject(menu:THANDLE; option:integer; value:PAnsiChar) : integer; stdcall;
+              external AppDLL name 'Menu_ConfigureObject';
 
-const
 {
   wparam=0
   lparam=*lpOptParam
   returns TRUE if it processed the command, FALSE otherwise
 }
-  MO_SETOPTIONSMENUOBJECT:PAnsiChar = 'MO/SetOptionsMenuObject';
 
-{
-  wparam=0
-  lparam=*lpOptParam
-  returns TRUE if it processed the command, FALSE otherwise
-}
-  MO_SETOPTIONSMENUITEM:PAnsiChar = 'MO/SetOptionsMenuItem';
+const 
+  OPT_USERDEFINEDITEMS = 1; // enables ability user to edit menuitems via options page.
+  OPT_HOTKEY = 2;
+
+function Menu_ConfigureItem(menu:THANDLE; option:integer; value:int_ptr) : integer; stdcall;
+              external AppDLL name 'Menu_ConfigureItem';
 
 {
   wparam=char* szProtoName
   lparam=0
   returns HGENMENU of the root item or NULL
 }
-  MO_GETPROTOROOTMENU:PAnsiChar = 'MO/GetProtoRootMenu';
+
+function Menu_GetProtocolRoot(const proto:PAnsiChar) : integer; stdcall;
+              external AppDLL name 'Menu_GetProtocolRoot';
 
 {$ENDIF}
-- 
cgit v1.2.3