From 5dc533256a87daab9e3b42b35614b411b189a985 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 17 Sep 2014 12:29:30 +0000 Subject: - MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, MS_CLIST_REMOVESUBGROUPMENUITEM & MS_CLIST_REMOVEGROUPMENUITEM removed; - minor code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@10496 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp | 28 ++++++++++------------ plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp | 7 ------ plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp | 26 ++++---------------- 3 files changed, 17 insertions(+), 44 deletions(-) (limited to 'plugins/Clist_modern/src') diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index 599a4f9d88..aa5e376f25 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -3785,22 +3785,20 @@ int CLUIFrameOnModulesUnload(WPARAM wParam, LPARAM lParam) if (!_hmiVisible) return 0; - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiVisible, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiTBVisible, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiLock, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiColl, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiFloating, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignTop, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignClient, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignBottom, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiBorder, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignRoot, 0); - - - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosUp, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosDown, 0); - CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosRoot, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiVisible, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiTBVisible, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiLock, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiColl, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiFloating, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiAlignTop, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiAlignClient, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiAlignBottom, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiBorder, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiAlignRoot, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiPosUp, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiPosDown, 0); + CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiPosRoot, 0); CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiVisible, 0); CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiTBVisible, 0); diff --git a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp index d500d29286..8b1bf6af9e 100644 --- a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp @@ -45,12 +45,6 @@ static INT_PTR AddContextFrameMenuItem(WPARAM wParam, LPARAM lParam) return CallService(MO_ADDNEWMENUITEM, (WPARAM)hFrameMenuObject, (LPARAM)&tmi); } -static INT_PTR RemoveContextFrameMenuItem(WPARAM wParam, LPARAM lParam) -{ - CallService(MO_REMOVEMENUITEM, wParam, 0); - return 0; -} - //called with: //wparam - ownerdata //lparam - lparam from winproc @@ -110,7 +104,6 @@ int InitFramesMenus(void) 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); diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp index 674d2f8b11..f4c35c0cb6 100644 --- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp @@ -51,14 +51,6 @@ typedef struct } GroupMenuExecParam,*lpGroupMenuExecParam; -//wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM -//return 0 on success. -static INT_PTR RemoveGroupMenuItem(WPARAM wParam, LPARAM lParam) -{ - CallService(MO_REMOVEMENUITEM,wParam,0); - return 0; -} - INT_PTR BuildGroupMenu(WPARAM wParam, LPARAM lParam) { ListParam param = { 0 }; @@ -234,7 +226,6 @@ void GroupMenus_Init(void) CreateServiceFunction("CLISTMENUSGroup/CreateGroupHelper",CreateGroupHelper); CreateServiceFunction("CList/AddGroupMenuItem",AddGroupMenuItem); - CreateServiceFunction(MS_CLIST_REMOVEGROUPMENUITEM,RemoveGroupMenuItem); CreateServiceFunction(MS_CLIST_MENUBUILDGROUP,BuildGroupMenu); HookEvent(ME_CLIST_PREBUILDGROUPMENU,OnBuildGroupMenu); @@ -336,20 +327,12 @@ HANDLE hSubGroupStatusMenuItemProxy; HGENMENU hHideOfflineUsersHereMenuItem, hShowOfflineUsersHereMenuItem; //SubGroupmenu exec param(ownerdata) -typedef struct{ -char *szServiceName; -int Param1,Param2; -}SubGroupMenuExecParam,*lpSubGroupMenuExecParam; - -/* -wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM -return 0 on success. -*/ -static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam, LPARAM lParam) +typedef struct { - CallService(MO_REMOVEMENUITEM,wParam,0); - return 0; + char *szServiceName; + int Param1, Param2; } +SubGroupMenuExecParam,*lpSubGroupMenuExecParam; static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM lParam) { @@ -501,7 +484,6 @@ void InitSubGroupMenus(void) CreateServiceFunction("CLISTMENUSSubGroup/GroupMenuExecProxy",GroupMenuExecProxy); CreateServiceFunction("CList/AddSubGroupMenuItem",AddSubGroupMenuItem); - CreateServiceFunction(MS_CLIST_REMOVESUBGROUPMENUITEM,RemoveSubGroupMenuItem); CreateServiceFunction(MS_CLIST_MENUBUILDSUBGROUP,BuildSubGroupMenu); HookEvent(ME_CLIST_PREBUILDSUBGROUPMENU,OnBuildSubGroupMenu); -- cgit v1.2.3