- new menu object helpers (MO_CreateMenuObject, MO_SetMenuObjectParam);

- menu item display names are now translatable;
- old nasty pieces of junk removed in CLUIFrames/cluiframes.cpp

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

1 files changed, 13 insertions, 85 deletions

diff --git a/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp
index f850143c20..4e94c8b75f 100644
--- a/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp
@@ -127,93 +127,21 @@ static INT_PTR BuildContextFrameMenu(WPARAM wParam,LPARAM lParam)
 }

 

 // == == == == == == == == == == == == == Frames end

-boolean InternalGenMenuModule = FALSE;

-

-int MeasureItemProxy(WPARAM wParam,LPARAM lParam)

-{

-	int val;

-	if (InternalGenMenuModule) 

-	{

-		val = CallService(MS_INT_MENUMEASUREITEM,wParam,lParam);

-		if (val) return(val);

-	}

-	return CallService(MS_CLIST_MENUMEASUREITEM,wParam,lParam);

-}

-

-int DrawItemProxy(WPARAM wParam,LPARAM lParam)

-{

-	if (InternalGenMenuModule) 

-	{

-		int val;

-		val = CallService(MS_INT_MENUDRAWITEM,wParam,lParam);

-		if (val) return(val);

-	}

-	return CallService(MS_CLIST_MENUDRAWITEM,wParam,lParam);

-}

-

-int ProcessCommandProxy(WPARAM wParam,LPARAM lParam)

-{

-	if (InternalGenMenuModule) 

-	{

-		int val;

-		val = CallService(MS_INT_MENUPROCESSCOMMAND,wParam,lParam);

-		if (val) return(val);

-	}

-

-	return CallService(MS_CLIST_MENUPROCESSCOMMAND,wParam,lParam);

-

-}

-

-int ModifyMenuItemProxy(WPARAM wParam,LPARAM lParam)

-{

-	if (InternalGenMenuModule) 

-	{

-		int val;

-		val = CallService(MS_INT_MODIFYMENUITEM,wParam,lParam);

-		if (val) return(val);

-	}

-

-	return CallService(MS_CLIST_MODIFYMENUITEM,wParam,lParam);

-}

 

 int InitFramesMenus(void)

 {

-	TMenuParam tmp;

-

-	if ( !ServiceExists(MO_REMOVEMENUOBJECT))

-	{

-

-		InitCustomMenus();

-		InternalGenMenuModule = TRUE;

-	}

-

-	if (ServiceExists(MO_REMOVEMENUOBJECT))

-	{

-		CreateServiceFunction("FrameMenuExecService",FrameMenuExecService);

-		CreateServiceFunction("FrameMenuCheckService",FrameMenuCheckService);

-		CreateServiceFunction("FrameMenuFreeService",FreeOwnerDataFrameMenu);

-

-

-		CreateServiceFunction(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM,RemoveContextFrameMenuItem);

-		CreateServiceFunction("CList/AddContextFrameMenuItem",AddContextFrameMenuItem);

-		CreateServiceFunction(MS_CLIST_MENUBUILDFRAMECONTEXT,BuildContextFrameMenu);

-		CreateServiceFunction(MS_CLIST_FRAMEMENUNOTIFY,ContextFrameMenuNotify);

-		hPreBuildFrameMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDFRAMEMENU);

-

-		//frame menu object

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

-		tmp.cbSize = sizeof(tmp);

-		tmp.CheckService = "FrameMenuCheckService";

-		tmp.ExecService = "FrameMenuExecService";

-		tmp.name = "FrameMenu";

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

-		{

-			OptParam op;

-			op.Handle = hFrameMenuObject;

-			op.Setting = OPT_MENUOBJECT_SET_FREE_SERVICE;

-			op.Value = (INT_PTR)"FrameMenuFreeService";

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

-		}

-	}

+	CreateServiceFunction("FrameMenuExecService", FrameMenuExecService);

+	CreateServiceFunction("FrameMenuCheckService", FrameMenuCheckService);

+	CreateServiceFunction("FrameMenuFreeService", FreeOwnerDataFrameMenu);

+

+	CreateServiceFunction(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, RemoveContextFrameMenuItem);

+	CreateServiceFunction("CList/AddContextFrameMenuItem", AddContextFrameMenuItem);

+	CreateServiceFunction(MS_CLIST_MENUBUILDFRAMECONTEXT, BuildContextFrameMenu);

+	CreateServiceFunction(MS_CLIST_FRAMEMENUNOTIFY, ContextFrameMenuNotify);

+	hPreBuildFrameMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDFRAMEMENU);

+

+	// frame menu object

+	hFrameMenuObject = MO_CreateMenuObject("FrameMenu", LPGEN("Frame menu"), "FrameMenuCheckService", "FrameMenuExecService");

+	MO_SetMenuObjectParam(hFrameMenuObject, OPT_MENUOBJECT_SET_FREE_SERVICE, "FrameMenuFreeService");

 	return 0;

 }