From b08b18214743511f53241d4820b9d0370c49540c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Sun, 12 Feb 2012 20:04:50 +0100 Subject: [PATCH] menu: remove OpenWorkspaceMenu() The function OpenWorkspaceMenu() is not used, remove it. Signed-off-by: Carlos R. Mafra --- src/funcs.h | 2 -- src/menu.c | 33 --------------------------------- 2 files changed, 35 deletions(-) diff --git a/src/funcs.h b/src/funcs.h index 5d813ea6..6d2c5528 100644 --- a/src/funcs.h +++ b/src/funcs.h @@ -61,8 +61,6 @@ void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard); void OpenMiniwindowMenu(WWindow *wwin, int x, int y); -void OpenWorkspaceMenu(WScreen *scr, int x, int y); - void CloseWindowMenu(WScreen *scr); void DestroyWindowMenu(WScreen *scr); diff --git a/src/menu.c b/src/menu.c index 5286899d..449904fd 100644 --- a/src/menu.c +++ b/src/menu.c @@ -2503,36 +2503,3 @@ void wMenuRestoreState(WScreen * scr) } restoreMenuRecurs(scr, menus, scr->root_menu, ""); } - -void OpenWorkspaceMenu(WScreen * scr, int x, int y) -{ - WMenu *menu, *parent; - WMenuEntry *entry; - - if (!scr->root_menu) { - OpenRootMenu(scr, scr->scr_width * 2, 0, False); - wMenuUnmap(scr->root_menu); - } - - menu = scr->workspace_menu; - if (menu) { - if (menu->flags.mapped) { - if (!menu->flags.buttoned) { - wMenuUnmap(menu); - parent = menu->parent; - if (parent && parent->selected_entry >= 0) { - entry = parent->entries[parent->selected_entry]; - if (parent->cascades[entry->cascade] == menu) { - selectEntry(parent, -1); - wMenuMapAt(menu, x, y, False); - } - } - } else { - wRaiseFrame(menu->frame->core); - wMenuMapCopyAt(menu, x, y); - } - } else { - wMenuMapAt(menu, x, y, False); - } - } -}