- 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

4 files changed, 23 insertions, 36 deletions

diff --git a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
index 4f11a5d83d..a8d4a70d58 100644
--- a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
@@ -111,6 +111,6 @@ int InitFramesMenus(void)
 

 	// frame menu object

 	hFrameMenuObject = MO_CreateMenuObject("FrameMenu", LPGEN("Frame menu"), "FrameMenuCheckService", "FrameMenuExecService");

-	MO_SetMenuObjectParam(hFrameMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "FrameMenuFreeService");

+	Menu_ConfigureObject(hFrameMenuObject, MCO_OPT_FREE_SERVICE, "FrameMenuFreeService");

 	return 0;

 }

diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
index fd4d0f60db..57cf2ac25f 100644
--- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
@@ -84,15 +84,12 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam, LPARAM lParam)
 	}

 	tmi.ownerdata = mmep;

 

+	HGENMENU hNewItem = (HGENMENU)CallService(MO_ADDNEWMENUITEM, (WPARAM)hGroupMenuObject, (LPARAM)&tmi);

+

 	char buf[1024];

 	mir_snprintf(buf, "%s/%s", mi->pszService, mi->pszName);

-

-	OptParam op;

-	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM, (WPARAM)hGroupMenuObject, (LPARAM)&tmi);

-	op.Setting = OPT_MENUITEMSETUNIQNAME;

-	op.Value = (INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM, 0, (LPARAM)&op);

-	return (INT_PTR)op.Handle;

+	Menu_ConfigureItem(hNewItem, MCI_OPT_UNIQUENAME, buf);

+	return (INT_PTR)hNewItem;

 }

 

 int GroupMenuCheckService(WPARAM, LPARAM)

@@ -229,9 +226,9 @@ void GroupMenus_Init(void)
 

 	// Group menu

 	hGroupMenuObject = MO_CreateMenuObject("GroupMenu", LPGEN("Group menu"), 0, "CLISTMENUSGroup/ExecService");

-	MO_SetMenuObjectParam(hGroupMenuObject, OPT_USERDEFINEDITEMS, TRUE);

-	MO_SetMenuObjectParam(hGroupMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "CLISTMENUSGroup/FreeOwnerDataGroupMenu");

-	MO_SetMenuObjectParam(hGroupMenuObject, OPT_MENUOBJECT_SET_ONADD_SERVICE, "CLISTMENUSGroup/GroupMenuonAddService");

+	Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_USERDEFINEDITEMS, TRUE);

+	Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSGroup/FreeOwnerDataGroupMenu");

+	Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSGroup/GroupMenuonAddService");

 

 	//add  exit command to menu

 	GroupMenuParam gmp;

@@ -395,15 +392,12 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam, LPARAM lParam)
 	}

 	tmi.ownerdata = mmep;

 

+	HGENMENU hNewItem = (HGENMENU)CallService(MO_ADDNEWMENUITEM, (WPARAM)hSubGroupMenuObject, (LPARAM)&tmi);

+

 	char buf[1024];

 	mir_snprintf(buf, "%s/%s", mi->pszService, mi->pszName);

-

-	OptParam op;

-	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM, (WPARAM)hSubGroupMenuObject, (LPARAM)&tmi);

-	op.Setting = OPT_MENUITEMSETUNIQNAME;

-	op.Value = (INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM, 0, (LPARAM)&op);

-	return (INT_PTR)op.Handle;

+	Menu_ConfigureItem(hNewItem, MCI_OPT_UNIQUENAME, buf);

+	return (INT_PTR)hNewItem;

 }

 

 INT_PTR SubGroupMenuCheckService(WPARAM wParam, LPARAM)

@@ -477,10 +471,10 @@ void InitSubGroupMenus(void)
 

 	// SubGroup menu

 	hSubGroupMenuObject = MO_CreateMenuObject("SubGroupMenu", LPGEN("Subgroup menu"), 0, "CLISTMENUSSubGroup/ExecService");

-	MO_SetMenuObjectParam(hSubGroupMenuObject, OPT_USERDEFINEDITEMS, TRUE);

-	MO_SetMenuObjectParam(hSubGroupMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu");

-	MO_SetMenuObjectParam(hSubGroupMenuObject, OPT_MENUOBJECT_SET_ONADD_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuonAddService");

-	MO_SetMenuObjectParam(hSubGroupMenuObject, OPT_MENUOBJECT_SET_CHECK_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuCheckService");

+	Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_USERDEFINEDITEMS, TRUE);

+	Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu");

+	Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuonAddService");

+	Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_CHECK_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuCheckService");

 

 	// add exit command to menu

 	GroupMenuParam gmp;

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index 809bb75508..0962902ba1 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -121,11 +121,7 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 		bModifyMenu = TRUE;

 	}

 

-	OptParam op;

-	op.Handle = hFavoriteContactMenu;

-	op.Setting = OPT_MENUITEMSETUNIQNAME;

-	op.Value = (INT_PTR)"ModernClistMenu_ContactRate";

-	CallService(MO_SETOPTIONSMENUITEM, 0, (LPARAM)&op);

+	Menu_ConfigureObject(hFavoriteContactMenu, MCI_OPT_UNIQUENAME, "ModernClistMenu_ContactRate");

 

 	mi.hParentMenu = hFavoriteContactMenu;

 	if (!hFavoriteContactMenuItems) {

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index 47c96ad7f7..7854a6abfa 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -181,12 +181,9 @@ static INT_PTR AddTrayMenuItem(WPARAM, LPARAM lParam)
 

 	tmi.ownerdata = mir_strdup(mi->pszService);

 

-	OptParam op;

-	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM, (WPARAM)hTrayMenuObject, (LPARAM)&tmi);

-	op.Setting = OPT_MENUITEMSETUNIQNAME;

-	op.Value = (INT_PTR)mi->pszService;

-	CallService(MO_SETOPTIONSMENUITEM, 0, (LPARAM)&op);

-	return (INT_PTR)op.Handle;

+	HGENMENU hNewItem = (HGENMENU)CallService(MO_ADDNEWMENUITEM, (WPARAM)hTrayMenuObject, (LPARAM)&tmi);

+	Menu_ConfigureItem(hNewItem, MCI_OPT_UNIQUENAME, mi->pszService);

+	return (INT_PTR)hNewItem;

 }

 

 INT_PTR TrayMenuonAddService(WPARAM wParam, LPARAM lParam)

@@ -315,9 +312,9 @@ void InitTrayMenus(void)
 

 	// Tray menu

 	hTrayMenuObject = MO_CreateMenuObject("TrayMenu", LPGEN("Tray menu"), 0, "CLISTMENUSTRAY/ExecService");

-	MO_SetMenuObjectParam(hTrayMenuObject, OPT_USERDEFINEDITEMS, TRUE);

-	MO_SetMenuObjectParam(hTrayMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "CLISTMENUSTRAY/FreeOwnerDataTrayMenu");

-	MO_SetMenuObjectParam(hTrayMenuObject, OPT_MENUOBJECT_SET_ONADD_SERVICE, "CLISTMENUSTRAY/TrayMenuonAddService");

+	Menu_ConfigureObject(hTrayMenuObject, MCO_OPT_USERDEFINEDITEMS, TRUE);

+	Menu_ConfigureObject(hTrayMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSTRAY/FreeOwnerDataTrayMenu");

+	Menu_ConfigureObject(hTrayMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSTRAY/TrayMenuonAddService");

 

 	// add exit command to menu

 	CLISTMENUITEM mi = { 0 };