final switch to the typed icolib api

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

1 files changed, 21 insertions, 21 deletions

diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp
index a92a2b4113..7053207a65 100644
--- a/plugins/Clist_mw/src/groupmenu.cpp
+++ b/plugins/Clist_mw/src/groupmenu.cpp
@@ -113,7 +113,7 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam)
 	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hGroupMenuObject,(LPARAM)&tmi);

 	op.Setting = OPT_MENUITEMSETUNIQNAME;	

 	op.Value = (INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUITEM,0,(LPARAM)&op);

 	return (INT_PTR)op.Handle;

 

 //	mainItemCount++;

@@ -280,23 +280,23 @@ void InitGroupMenus(void)
 	tmp.CheckService = NULL;

 	tmp.ExecService = "CLISTMENUSGroup/ExecService";

 	tmp.name = "Group Menu";

-	hGroupMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT,(WPARAM)0,(LPARAM)&tmp);

+	hGroupMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT,0,(LPARAM)&tmp);

 	

 	

 	op.Handle = hGroupMenuObject;

 	op.Setting = OPT_USERDEFINEDITEMS;

 	op.Value = TRUE;

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 	

 	op.Handle = hGroupMenuObject;

 	op.Setting = OPT_MENUOBJECT_SET_FREE_SERVICE;

 	op.Value = (INT_PTR)"CLISTMENUSGroup/FreeOwnerDataGroupMenu";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	op.Handle = hGroupMenuObject;

 	op.Setting = OPT_MENUOBJECT_SET_ONADD_SERVICE;

 	op.Value = (INT_PTR)"CLISTMENUSGroup/GroupMenuonAddService";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	{	

 	//add  exit command to menu

@@ -308,14 +308,14 @@ void InitGroupMenus(void)
 	mi.position = 1900000;

 	mi.pszService = "CloseAction";

 	mi.pszName = LPGEN("E&xit");

-	AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+	AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

 	mi.position = 500;

 	mi.pszService = MS_CLIST_SHOWHIDE;

 	mi.pszName = LPGEN("&Hide/Show");

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

+	hHideShowMainMenuItem = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

@@ -323,7 +323,7 @@ void InitGroupMenus(void)
 	mi.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_FINDUSER));

 	mi.pszService = "FindAdd/FindAddCommand";

 	mi.pszName = LPGEN("&Find/Add Contacts...");

-	AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+	AddGroupMenuItem(0,(LPARAM)&mi);

 	

 	

 	

@@ -332,14 +332,14 @@ void InitGroupMenus(void)
 	mi.position = 300000;

 	mi.pszService = "";

 	mi.pszName = LPGEN("&Main Menu");

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

+	hGroupMainMenuItemProxy = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

 	mi.position = 300100;

 	mi.pszService = "";

 	mi.pszName = LPGEN("&Status");

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

+	hGroupStatusMenuItemProxy = (HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

@@ -348,7 +348,7 @@ void InitGroupMenus(void)
 	mi.pszService = "Options/OptionsCommand";

 	mi.pszName = LPGEN("&Options...");

 	

-	AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+	AddGroupMenuItem(0,(LPARAM)&mi);

 

 

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

@@ -358,7 +358,7 @@ void InitGroupMenus(void)
 	mi.pszService = "Help/AboutCommand";

 	mi.pszName = LPGEN("&About");

 	

-	//AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+	//AddGroupMenuItem(0,(LPARAM)&mi);

 

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

 	mi.cbSize = sizeof(mi);

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

 	mi.pszService = MS_CLIST_GROUPCREATE;

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

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

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

 

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

 	mi.cbSize = sizeof(mi);

@@ -383,7 +383,7 @@ void InitGroupMenus(void)
 	mi.hIcon = NULL;

 	mi.pszService = "CLISTMENUSGroup/HideOfflineRootHelper";

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

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

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

 

 

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

@@ -392,7 +392,7 @@ void InitGroupMenus(void)
 	mi.hIcon = NULL;

 	mi.pszService = "CLISTMENUSGroup/HideGroupsHelper";

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

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

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

 

 

 

@@ -402,7 +402,7 @@ void InitGroupMenus(void)
 	mi.hIcon = NULL;

 	mi.pszService = "CLISTMENUSGroup/UseGroupsHelper";

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

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

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

 	

 	

 	HookEvent(ME_SKIN2_ICONSCHANGED,OnIconLibIconChanged);

@@ -505,7 +505,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
 	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hSubGroupMenuObject,(LPARAM)&tmi);

 	op.Setting = OPT_MENUITEMSETUNIQNAME;

 	op.Value = (INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUITEM,0,(LPARAM)&op);

 	return (INT_PTR)op.Handle;

 }

 

@@ -582,23 +582,23 @@ void InitSubGroupMenus(void)
 	tmp.CheckService = NULL;

 	tmp.ExecService = "CLISTMENUSSubGroup/ExecService";

 	tmp.name = "SubGroupMenu";

-	hSubGroupMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT,(WPARAM)0,(LPARAM)&tmp);

+	hSubGroupMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT,0,(LPARAM)&tmp);

 	

 	

 	op.Handle = hSubGroupMenuObject;

 	op.Setting = OPT_USERDEFINEDITEMS;

 	op.Value = TRUE;

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 	

 	op.Handle = hSubGroupMenuObject;

 	op.Setting = OPT_MENUOBJECT_SET_FREE_SERVICE;

 	op.Value = (INT_PTR)"CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	op.Handle = hSubGroupMenuObject;

 	op.Setting = OPT_MENUOBJECT_SET_ONADD_SERVICE;

 	op.Value = (INT_PTR)"CLISTMENUSSubGroup/SubGroupMenuonAddService";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	{	

 	//add  exit command to menu