gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: remove parameter 'which' from local function 'restoreMenu'

Browse Source 
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 <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-12-08 22:42:41 +01:00
committed by Carlos R. Mafra
parent 1d1c5f77c7
commit b3c20610e9
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/menu.c
View File

@@ -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);