- CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu;

- Menu_AddContactMenuItem now receives parameter szProto;
- Menu_Add* helpers are converted into real functions;

git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 16 insertions, 5 deletions

diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 1d7e4b25c5..82cb8e4cfa 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -274,11 +274,22 @@ DLL_EXPORT int Load(void)
 	CLISTMENUITEM mi = { 0 };
 	mi.flags = CMIF_TCHAR;
 	mi.icolibItem = GetIconHandle(ICO_MAINXS);
-	#define _Menu_AddMainMenuItemEx(name,srv,pos) do{mi.ptszName=name;mi.pszService=srv;mi.position=pos;Menu_AddMainMenuItem(&mi);}while(0)
-	#define _Menu_AddContactMenuItemEx(name,srv,pos) do{mi.ptszName=name;mi.pszService=srv;mi.position=pos;Menu_AddContactMenuItem(&mi);}while(0)
-	_Menu_AddMainMenuItemEx(LPGENT("Take a screenshot"),MS_SENDSS_OPENDIALOG,1000001);
-	_Menu_AddContactMenuItemEx(LPGENT("Send screenshot"),MS_SENDSS_OPENDIALOG,1000000);
-	_Menu_AddContactMenuItemEx(LPGENT("Send desktop screenshot"),MS_SENDSS_SENDDESKTOP,1000001);
+	
+	mi.name.t = LPGENT("Take a screenshot");
+	mi.pszService = MS_SENDSS_OPENDIALOG;
+	mi.position = 1000001;
+	Menu_AddMainMenuItem(&mi);
+
+	mi.name.t = LPGENT("Send screenshot");
+	mi.pszService = MS_SENDSS_OPENDIALOG;
+	mi.position = 1000000;
+	Menu_AddContactMenuItem(&mi);
+
+	mi.name.t = LPGENT("Send desktop screenshot");
+	mi.pszService = MS_SENDSS_SENDDESKTOP;
+	mi.position = 1000001;
+	Menu_AddContactMenuItem(&mi);
+
 	/// hotkey's
 	HOTKEYDESC hkd={sizeof(hkd)};
 	hkd.pszName="Open SendSS+";