rest of menu cleaning

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

1 files changed, 14 insertions, 15 deletions

diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
index 498dc2e896..4441022cfa 100644
--- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
@@ -77,10 +77,9 @@ static int sortfunc(const void *a,const void *b)
 #define CLUIFRAMESMOVEUPDOWN			"CLUIFramesMoveUpDown"

 typedef struct tagMenuHandles

 {

-	HANDLE MainMenuItem;

-	HANDLE MIVisible,MITitle,MITBVisible,MILock,MIColl,MIFloating,MIAlignRoot;

-	HANDLE MIAlignTop,MIAlignClient,MIAlignBottom;

-	HANDLE MIBorder;

+	HGENMENU MainMenuItem;

+	HGENMENU MIVisible,MITitle,MITBVisible,MILock,MIColl,MIFloating,MIAlignRoot;

+	HGENMENU MIAlignTop,MIAlignClient,MIAlignBottom,MIBorder;

 } FrameMenuHandles;

 

 typedef struct tagFrameTitleBar{

@@ -632,7 +631,7 @@ int CLUIFramesGetalClientFrame(void)
 

 HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGENMENU (*pfnAdd )( CLISTMENUITEM* ))

 {

-	HANDLE menuid;

+	HGENMENU menuid;

 	int framepos = id2pos(frameid);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

@@ -864,44 +863,44 @@ INT_PTR CLUIFramesModifyMainMenuItems(WPARAM wParam,LPARAM lParam)
 		CLISTMENUITEM mi = { sizeof(mi) };

 		mi.flags = CMIM_NAME|CMIF_CHILDPOPUP|CMIF_TCHAR;

 		mi.ptszName = Frames[pos].TitleBar.tbname ? Frames[pos].TitleBar.tbname : Frames[pos].name;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MITitle,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MITitle, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP;

 		if (Frames[pos].visible) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIVisible,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MIVisible, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP;

 		if (Frames[pos].Locked) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MILock,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MILock, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP;

 		if (Frames[pos].TitleBar.ShowTitleBar) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MITBVisible,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MITBVisible, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP;

 		if (Frames[pos].floating) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIFloating,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MIFloating, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP;

 		if ((Frames[pos].UseBorder)) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIBorder,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MIBorder, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP|((Frames[pos].align&alClient)?CMIF_GRAYED:0);

 		if (Frames[pos].align&alTop) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIAlignTop,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MIAlignTop, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP;

 		if (Frames[pos].align&alClient) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIAlignClient,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MIAlignClient, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP|((Frames[pos].align&alClient)?CMIF_GRAYED:0);

 		if (Frames[pos].align&alBottom) mi.flags |= CMIF_CHECKED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIAlignBottom,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MIAlignBottom, &mi);

 

 		mi.flags = CMIM_FLAGS|CMIF_CHILDPOPUP;

 		if (Frames[pos].collapsed) mi.flags |= CMIF_CHECKED;

 		if ((!Frames[pos].visible)||Frames[pos].Locked||(pos == CLUIFramesGetalClientFrame())) mi.flags |= CMIF_GRAYED;

-		CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIColl,(LPARAM)&mi);

+		Menu_ModifyItem(Frames[pos].MenuHandles.MIColl, &mi);

 	}

 	ulockfrm();

 	return 0;