- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.

- massive cleanup of the menu-related code

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

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index afebbe75e3..debafada7a 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -321,7 +321,7 @@ void InitMenuItems(void) {
 	mi.position		= -1000000000 /*1000001*/;

 	mi.ptszName		= LPGENT(MODULNAME_PLU);

 	mi.hIcon		= IcoLib_GetIcon(PopUpOptions.ModuleIsEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF ,0);

-	hMenuRoot		= (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi);

+	hMenuRoot		= Menu_AddMainMenuItem(&mi);

 

 	// Add item to main menu

 	mi.hParentMenu		= (HGENMENU)hMenuRoot;

@@ -329,7 +329,7 @@ void InitMenuItems(void) {
 	hTogglePopup = CreateServiceFunction(MENUCOMMAND_SVC, svcEnableDisableMenuCommand);

 	mi.ptszName			= PopUpOptions.ModuleIsEnabled ? LPGENT("Disable &popup module") : LPGENT("Enable &popup module");

 	mi.pszService		= MENUCOMMAND_SVC;

-	hMenuItem			= (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, (WPARAM)0, (LPARAM)&mi);

+	hMenuItem			= Menu_AddMainMenuItem(&mi);

 

 	// Popup History

 	hShowHistory = CreateServiceFunction(MENUCOMMAND_HISTORY, svcShowHistory);

@@ -338,7 +338,7 @@ void InitMenuItems(void) {
 	mi.ptszName			= LPGENT("Popup History");

 	mi.hIcon			= IcoLib_GetIcon(ICO_HISTORY, 0);

 	mi.pszService		= MENUCOMMAND_HISTORY;

-	hMenuItemHistory	= (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, (WPARAM)0, (LPARAM)&mi);

+	hMenuItemHistory	= Menu_AddMainMenuItem(&mi);

 

 }