1 files changed, 18 insertions, 26 deletions

diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp
index 118d66a463..121f166b26 100644
--- a/plugins/Clist_mw/src/groupmenu.cpp
+++ b/plugins/Clist_mw/src/groupmenu.cpp
@@ -34,12 +34,8 @@ HANDLE hGroupMainMenuItemProxy;
 HANDLE hGroupStatusMenuItemProxy;

 HANDLE hPreBuildGroupMenuEvent;

 

-HANDLE hHideOfflineUsersMenuItem;

-HANDLE hHideOfflineUsersOutHereMenuItem;

-HANDLE hHideEmptyGroupsMenuItem;

-HANDLE hDisableGroupsMenuItem;

-HANDLE hNewGroupMenuItem;

-HANDLE hNewSubGroupMenuItem;

+HGENMENU hHideOfflineUsersMenuItem, hHideOfflineUsersOutHereMenuItem, hHideEmptyGroupsMenuItem;

+HGENMENU hDisableGroupsMenuItem, hNewGroupMenuItem, hNewSubGroupMenuItem;

 

 int NewGroupIconidx;

 

@@ -211,16 +207,16 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam)
 {

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIM_FLAGS | ( db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CMIF_CHECKED:0);

-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideOfflineUsersMenuItem, (LPARAM)&mi);	

+	Menu_ModifyItem(hHideOfflineUsersMenuItem, &mi);	

 

 	mi.flags = CMIM_FLAGS | (SendMessage(pcli->hwndContactTree,CLM_GETHIDEOFFLINEROOT,0,0)?CMIF_CHECKED:0);

-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideOfflineUsersOutHereMenuItem, (LPARAM)&mi);	

+	Menu_ModifyItem(hHideOfflineUsersOutHereMenuItem, &mi);	

 	

 	mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS?CMIF_CHECKED:0);

-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideEmptyGroupsMenuItem, (LPARAM)&mi);	

+	Menu_ModifyItem(hHideEmptyGroupsMenuItem, &mi);	

 

 	mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS?0:CMIF_CHECKED);

-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hDisableGroupsMenuItem, (LPARAM)&mi);

+	Menu_ModifyItem(hDisableGroupsMenuItem, &mi);

 	return 0;

 }

 

@@ -232,8 +228,8 @@ int static OnIconLibIconChanged(WPARAM wParam,LPARAM lParam)
 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIM_ICON;

 	mi.hIcon = ImageList_GetIcon(hCListImages,NewGroupIconidx,0);

-	CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)hNewSubGroupMenuItem,(LPARAM)&mi);

-	CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)hNewGroupMenuItem,(LPARAM)&mi);

+	Menu_ModifyItem(hNewSubGroupMenuItem, &mi);

+	Menu_ModifyItem(hNewGroupMenuItem, &mi);

 	return 0;

 }

 

@@ -334,7 +330,6 @@ void InitGroupMenus(void)
 	

 	AddGroupMenuItem(0,(LPARAM)&mi);

 

-

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

 	mi.cbSize = sizeof(mi);

 	mi.position = 500000;

@@ -350,7 +345,7 @@ void InitGroupMenus(void)
 	mi.hIcon = ImageList_GetIcon(hCListImages,NewGroupIconidx,0);

 	mi.pszService = MS_CLIST_GROUPCREATE;

 	mi.pszName = LPGEN("&New Group");	

-	hNewGroupMenuItem = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

+	hNewGroupMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

@@ -359,7 +354,7 @@ void InitGroupMenus(void)
 	mi.pszService = MS_CLIST_SETHIDEOFFLINE;

 	mi.pszName = LPGEN("&Hide Offline Users");	

 	gmp.lParam = 0;gmp.wParam = -1;

-	hHideOfflineUsersMenuItem = (HANDLE)AddGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

+	hHideOfflineUsersMenuItem = (HGENMENU)AddGroupMenuItem((WPARAM)&gmp,(LPARAM)&mi);

 	

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

 	mi.cbSize = sizeof(mi);

@@ -367,8 +362,7 @@ void InitGroupMenus(void)
 	mi.hIcon = NULL;

 	mi.pszService = "CLISTMENUSGroup/HideOfflineRootHelper";

 	mi.pszName = LPGEN("Hide &Offline Users out here");	

-	hHideOfflineUsersOutHereMenuItem = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

-

+	hHideOfflineUsersOutHereMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

@@ -376,9 +370,7 @@ void InitGroupMenus(void)
 	mi.hIcon = NULL;

 	mi.pszService = "CLISTMENUSGroup/HideGroupsHelper";

 	mi.pszName = LPGEN("Hide &Empty Groups");	

-	hHideEmptyGroupsMenuItem = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

-

-

+	hHideEmptyGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

@@ -386,8 +378,7 @@ void InitGroupMenus(void)
 	mi.hIcon = NULL;

 	mi.pszService = "CLISTMENUSGroup/UseGroupsHelper";

 	mi.pszName = LPGEN("Disable &Groups");	

-	hDisableGroupsMenuItem = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

-	

+	hDisableGroupsMenuItem = (HGENMENU)AddGroupMenuItem(0,(LPARAM)&mi);

 	

 	HookEvent(ME_SKIN2_ICONSCHANGED,OnIconLibIconChanged);

 	

@@ -407,7 +398,8 @@ HANDLE hSubGroupMenuObject;
 HANDLE hSubGroupMainMenuItemProxy;

 HANDLE hSubGroupStatusMenuItemProxy;

 HANDLE hPreBuildSubGroupMenuEvent;

-HANDLE hHideOfflineUsersHereMenuItem;

+

+HGENMENU hHideOfflineUsersHereMenuItem;

 

 //SubGroupmenu exec param(ownerdata)

 typedef struct{

@@ -433,7 +425,7 @@ static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam)
 	//contact->group

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIM_FLAGS | (group->hideOffline?CMIF_CHECKED:0);

-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideOfflineUsersHereMenuItem, (LPARAM)&mi);	

+	Menu_ModifyItem(hHideOfflineUsersHereMenuItem, &mi);	

 	return 0;

 }

 

@@ -590,7 +582,7 @@ void InitSubGroupMenus(void)
 	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

 	mi.pszName = LPGEN("&New SubGroup");	

 	gmp.lParam = 0;gmp.wParam = POPUP_NEWSUBGROUP;

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

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

 

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

 	mi.cbSize = sizeof(mi);

@@ -599,7 +591,7 @@ void InitSubGroupMenus(void)
 	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

 	mi.pszName = LPGEN("&Hide Offline Users in here");	

 	gmp.lParam = 0;gmp.wParam = POPUP_GROUPHIDEOFFLINE;

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

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

 

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

 	mi.cbSize = sizeof(mi);