This parameter is given always the same value, so there is not reason to keep it. The code is updated to take this value into account, and the related constants are removed.
Signed-off-by: Christophe CURIS <[email protected]> --- src/menu.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/menu.c b/src/menu.c index e573b39..8322dbb 100644 --- a/src/menu.c +++ b/src/menu.c @@ -56,10 +56,6 @@ /***** Local Stuff ******/ -#define WSS_ROOTMENU (1<<0) -#define WSS_SWITCHMENU (1<<1) -#define WSS_WSMENU (1<<2) - static struct { int steps; int delay; @@ -2382,7 +2378,7 @@ static Bool getMenuInfo(WMPropList * info, int *x, int *y, Bool * lowered) return True; } -static int restoreMenu(WScreen * scr, WMPropList * menu, int which) +static int restoreMenu(WScreen *scr, WMPropList *menu) { int x, y; Bool lowered = False; @@ -2394,10 +2390,8 @@ static int restoreMenu(WScreen * scr, WMPropList * menu, int which) if (!getMenuInfo(menu, &x, &y, &lowered)) return False; - if (which & WSS_SWITCHMENU) { - OpenSwitchMenu(scr, x, y, False); - pmenu = scr->switch_menu; - } + OpenSwitchMenu(scr, x, y, False); + pmenu = scr->switch_menu; if (pmenu) { int width = MENUW(pmenu); @@ -2508,7 +2502,7 @@ void wMenuRestoreState(WScreen * scr) skey = WMCreatePLString("SwitchMenu"); menu = WMGetFromPLDictionary(menus, skey); WMReleasePropList(skey); - restoreMenu(scr, menu, WSS_SWITCHMENU); + restoreMenu(scr, menu); if (!scr->root_menu) { OpenRootMenu(scr, scr->scr_width * 2, 0, False); -- 2.1.3 -- To unsubscribe, send mail to [email protected].
