diff options
Diffstat (limited to 'plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp')
| -rw-r--r-- | plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index b0acb8a6e8..d4fe172364 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -54,11 +54,9 @@ extern HINSTANCE g_hInst; #define frame_menu_floating 4
#define frame_menu_skinned 5
-extern INT_PTR ModifyMenuItemProxy(WPARAM wParam, LPARAM lParam);
static int UpdateTBToolTip(int framepos);
INT_PTR CLUIFrameSetFloat(WPARAM wParam, LPARAM lParam);
int CLUIFrameResizeFloatingFrame(int framepos);
-extern int ProcessCommandProxy(WPARAM wParam, LPARAM lParam);
extern int InitFramesMenus(void);
extern int UnitFramesMenu();
static int CLUIFramesReSort();
@@ -793,9 +791,8 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, int root, int popuppos, HGENMENU int ModifyMItem(WPARAM wParam, LPARAM lParam)
{
- return ModifyMenuItemProxy(wParam, lParam);
-};
-
+ return CallService(MS_CLIST_MODIFYMENUITEM, wParam, lParam);
+}
static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam, LPARAM lParam)
{
@@ -2568,14 +2565,8 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return 0;
case WM_COMMAND:
- if (ServiceExists(MO_CREATENEWMENUOBJECT)) {
- if (ProcessCommandProxy(MAKEWPARAM(LOWORD(wParam), 0), (LPARAM)Frameid))
- break;
- }
- else {
- if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTEXTFRAMEMENU), (LPARAM)Frameid))
- break;
- }
+ if ( CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), 0), Frameid))
+ break;
if (HIWORD(wParam) == 0) {//mouse events for self created menu
framepos = id2pos(Frameid);
|