rest of genmenu api died

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

4 files changed, 46 insertions, 46 deletions

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index 4dcb13a226..011221b82a 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -2360,10 +2360,12 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 	switch (msg) {
 	case WM_CREATE:
 		return FALSE;
+
 	case WM_MEASUREITEM:
-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
+
 	case WM_DRAWITEM:
-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 
 	case WM_ENABLE:
 		if (hwnd != 0) InvalidateRect(hwnd, NULL, FALSE);
diff --git a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
index d013caefd9..3b7d343b8f 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
@@ -66,7 +66,7 @@ INT_PTR FrameMenuCheckService(WPARAM wParam, LPARAM)
 		return FALSE;

 

 	TMO_MenuItem mi;

-	if (CallService(MO_GETMENUITEM, (WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {

+	if (Menu_GetItemInfo(pcpp->MenuItemHandle, mi) == 0) {

 		lpFrameMenuExecParam fmep = (lpFrameMenuExecParam)mi.ownerdata;

 		if (fmep != NULL) {

 			//pcpp->wParam  -  frameid

diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index dd77bc9232..d05cd7e509 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -229,7 +229,7 @@ void InitGroupMenus(void)
 

 	InitSubGroupMenus();

 

-	//Group menu

+	// Group menu

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

 	Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_USERDEFINEDITEMS, TRUE);

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

@@ -476,46 +476,44 @@ void InitSubGroupMenus(void)
 	Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu");

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

 

-	{

-		//add  exit command to menu

-		GroupMenuParam gmp;

-

-		CLISTMENUITEM mi = { 0 };

-		mi.position = 1000;

-		mi.icolibItem = iconItem[0].hIcolib;

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&New subgroup");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_NEWSUBGROUP;

-		hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-

-		memset(&mi, 0, sizeof(mi));

-		mi.position = 1001;

-		mi.hIcon = NULL;

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&Hide offline users in here");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_GROUPHIDEOFFLINE;

-		hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-

-		memset(&mi, 0, sizeof(mi));

-		mi.position = 900001;

-		mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_RENAME);

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&Rename group");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_RENAMEGROUP;

-		AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-

-		memset(&mi, 0, sizeof(mi));

-		mi.position = 900002;

-		mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&Delete group");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_DELETEGROUP;

-		AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-	}

+	// add exit command to menu

+	GroupMenuParam gmp;

+

+	CLISTMENUITEM mi = { 0 };

+	mi.position = 1000;

+	mi.icolibItem = iconItem[0].hIcolib;

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&New subgroup");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_NEWSUBGROUP;

+	hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+	memset(&mi, 0, sizeof(mi));

+	mi.position = 1001;

+	mi.hIcon = NULL;

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&Hide offline users in here");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_GROUPHIDEOFFLINE;

+	hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+	memset(&mi, 0, sizeof(mi));

+	mi.position = 900001;

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_RENAME);

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&Rename group");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_RENAMEGROUP;

+	AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

+	memset(&mi, 0, sizeof(mi));

+	mi.position = 900002;

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&Delete group");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_DELETEGROUP;

+	AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

 }

 

 //////////////////////////////END SubGroup MENU/////////////////////////

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 810855072a..753a30e51d 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -1654,7 +1654,7 @@ buttons_done:
 			((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 0;
 			return TRUE;
 		}
-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
 
 	case WM_DRAWITEM:
 		{
@@ -1754,7 +1754,7 @@ buttons_done:
 			else if (dis->CtlType == ODT_MENU) {
 				if (dis->itemData == MENU_MIRANDAMENU)
 					break;
-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 			}
 		}
 		return 0;