From 68924bfc1a213e619563c2cffb6d44b5b5346f6d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 26 Jun 2015 18:21:10 +0000
Subject: next slice of cutting out unused menu features - popupPosition

git-svn-id: http://svn.miranda-ng.org/main/trunk@14400 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SmileyAdd/src/general.h    |  1 +
 plugins/SmileyAdd/src/main.cpp     |  1 -
 plugins/SmileyAdd/src/services.cpp | 19 +++++++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'plugins/SmileyAdd/src')

diff --git a/plugins/SmileyAdd/src/general.h b/plugins/SmileyAdd/src/general.h
index 7497c25396..964eea0f8b 100644
--- a/plugins/SmileyAdd/src/general.h
+++ b/plugins/SmileyAdd/src/general.h
@@ -36,6 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <sys/stat.h>
 #include <time.h>
 #include <gdiplus.h>
+#include <m_clist.h>
 #include <commctrl.h>
 #include <richedit.h>
 #include <delayimp.h>
diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp
index 44aed70e7e..51c13ae50d 100644
--- a/plugins/SmileyAdd/src/main.cpp
+++ b/plugins/SmileyAdd/src/main.cpp
@@ -52,7 +52,6 @@ static int ModulesLoaded(WPARAM, LPARAM)
 {
 	CLISTMENUITEM mi = { 0 };
 	mi.flags = CMIF_ROOTHANDLE;
-	mi.popupPosition = 2000070050;
 	mi.position = 2000070050;
 	mi.icolibItem = icon.hIcolib;
 	mi.hParentMenu = HGENMENU_ROOT;
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp
index 5dd9c3bf07..44de589741 100644
--- a/plugins/SmileyAdd/src/services.cpp
+++ b/plugins/SmileyAdd/src/services.cpp
@@ -305,10 +305,8 @@ int RebuildContactMenu(WPARAM wParam, LPARAM)
 				continue;
 
 			const int ind = i + 3;
-
-			mi.position      = ind;
-			mi.popupPosition = ind;
-			mi.ptszName      = (TCHAR*)smc[i].GetDisplayName().c_str();
+			mi.position = ind;
+			mi.ptszName = (TCHAR*)smc[i].GetDisplayName().c_str();
 
 			if (cat == smc[i].GetName()) {
 				mi.flags |= CMIF_CHECKED; 
@@ -316,27 +314,28 @@ int RebuildContactMenu(WPARAM wParam, LPARAM)
 			}
 
 			hMenu = Menu_AddContactMenuItem(&mi);
+			Menu_ConfigureItem(hMenu, MCI_OPT_EXECPARAM, ind);
 			menuHandleArray.insert(hMenu);
 			mi.flags &= ~CMIF_CHECKED;
 		}
 
-		mi.position      = 1;
-		mi.popupPosition = 1;
-		mi.ptszName      = _T("<None>");
+		mi.position = 1;
+		mi.ptszName = _T("<None>");
 		if (cat == _T("<None>")) {
 			mi.flags |= CMIF_CHECKED; 
 			nonecheck = false;
 		}
 
 		hMenu = Menu_AddContactMenuItem(&mi);
+		Menu_ConfigureItem(hMenu, MCI_OPT_EXECPARAM, 1);
 		menuHandleArray.insert(hMenu);
 
-		mi.position      = 2;
-		mi.popupPosition = 2;
-		mi.ptszName      = LPGENT("Protocol specific");
+		mi.position = 2;
+		mi.ptszName = LPGENT("Protocol specific");
 		if (nonecheck) mi.flags |= CMIF_CHECKED; else mi.flags &= ~CMIF_CHECKED;
 
 		hMenu = Menu_AddContactMenuItem(&mi);
+		Menu_ConfigureItem(hMenu, MCI_OPT_EXECPARAM, 2);
 		menuHandleArray.insert(hMenu);
 	}
 
-- 
cgit v1.2.3