swick@ATHENA.MIT.EDU (Ralph R. Swick) (10/01/87)
SYNOPSIS: XMenuCreate() does not read defaults from .Xdefaults. DESCRIPTION: lib/oldXMenu/Create.c neglects to pass the 'display' argument in the calls to XGetDefault, therefore no defaults are read. FIX: apply the following patch. *** Create.c.10 Thu Oct 1 15:25:48 1987 --- Create.c Thu Oct 1 15:17:28 1987 *************** *** 1,2 **** ! /* $Header: Create.c,v 1.10 87/09/10 23:04:14 toddb Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ --- 1,2 ---- ! /* $Header: Create.c,v 1.11 87/10/01 15:18:00 swick Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ *************** *** 188,190 **** */ ! def_val = XGetDefault(def_env, "MenuFreeze"); if (def_val != NULL) { --- 188,190 ---- */ ! def_val = XGetDefault(display, def_env, "MenuFreeze"); if (def_val != NULL) { *************** *** 194,196 **** ! def_val = XGetDefault(def_env, "MenuReverseVideo"); if (def_val != NULL) { --- 194,196 ---- ! def_val = XGetDefault(display, def_env, "MenuReverseVideo"); if (def_val != NULL) { *************** *** 200,202 **** ! def_val = XGetDefault(def_env, "MenuStyle"); if (def_val != NULL) { --- 200,202 ---- ! def_val = XGetDefault(display, def_env, "MenuStyle"); if (def_val != NULL) { *************** *** 207,209 **** ! def_val = XGetDefault(def_env, "MenuMode"); if (def_val != NULL) { --- 207,209 ---- ! def_val = XGetDefault(display, def_env, "MenuMode"); if (def_val != NULL) { *************** *** 213,215 **** ! def_val = XGetDefault(def_env, "MenuMouse"); if ( --- 213,215 ---- ! def_val = XGetDefault(display, def_env, "MenuMouse"); if ( *************** *** 237,239 **** ! def_val = XGetDefault(def_env, "MenuBackground"); if ( --- 237,239 ---- ! def_val = XGetDefault(display, def_env, "MenuBackground"); if ( *************** *** 259,261 **** ! def_val = XGetDefault(def_env, "MenuInactivePattern"); if (def_val != NULL) { --- 259,261 ---- ! def_val = XGetDefault(display, def_env, "MenuInactivePattern"); if (def_val != NULL) { *************** *** 268,270 **** ! def_val = XGetDefault(def_env, "PaneStyle"); if (def_val != NULL) { --- 268,270 ---- ! def_val = XGetDefault(display, def_env, "PaneStyle"); if (def_val != NULL) { *************** *** 275,277 **** ! def_val = XGetDefault(def_env, "PaneFont"); if (def_val != NULL) p_fnt_name = def_val; --- 275,277 ---- ! def_val = XGetDefault(display, def_env, "PaneFont"); if (def_val != NULL) p_fnt_name = def_val; *************** *** 278,280 **** ! def_val = XGetDefault(def_env, "PaneForeground"); if ( --- 278,280 ---- ! def_val = XGetDefault(display, def_env, "PaneForeground"); if ( *************** *** 298,300 **** ! def_val = XGetDefault(def_env, "PaneBorder"); if ( --- 298,300 ---- ! def_val = XGetDefault(display, def_env, "PaneBorder"); if ( *************** *** 318,320 **** ! def_val = XGetDefault(def_env, "PaneBorderWidth"); if (def_val != NULL) p_bdr_width = atoi(def_val); --- 318,320 ---- ! def_val = XGetDefault(display, def_env, "PaneBorderWidth"); if (def_val != NULL) p_bdr_width = atoi(def_val); *************** *** 321,323 **** ! def_val = XGetDefault(def_env, "PaneSpread"); if (def_val != NULL) p_spread = atof(def_val); --- 321,323 ---- ! def_val = XGetDefault(display, def_env, "PaneSpread"); if (def_val != NULL) p_spread = atof(def_val); *************** *** 324,326 **** ! def_val = XGetDefault(def_env, "SelectionStyle"); if (def_val != NULL) { --- 324,326 ---- ! def_val = XGetDefault(display, def_env, "SelectionStyle"); if (def_val != NULL) { *************** *** 331,333 **** ! def_val = XGetDefault(def_env, "SelectionFont"); if (def_val != NULL) s_fnt_name = def_val; --- 331,333 ---- ! def_val = XGetDefault(display, def_env, "SelectionFont"); if (def_val != NULL) s_fnt_name = def_val; *************** *** 334,336 **** ! def_val = XGetDefault(def_env, "SelectionForeground"); if ( --- 334,336 ---- ! def_val = XGetDefault(display, def_env, "SelectionForeground"); if ( *************** *** 357,359 **** ! def_val = XGetDefault(def_env, "SelectionBorder"); if ( --- 357,359 ---- ! def_val = XGetDefault(display, def_env, "SelectionBorder"); if ( *************** *** 379,381 **** ! def_val = XGetDefault(def_env, "SelectionBorderWidth"); if (def_val != NULL) s_bdr_width = atoi(def_val); --- 379,381 ---- ! def_val = XGetDefault(display, def_env, "SelectionBorderWidth"); if (def_val != NULL) s_bdr_width = atoi(def_val); *************** *** 382,384 **** ! def_val = XGetDefault(def_env, "SelectionSpread"); if (def_val != NULL) s_spread = atof(def_val); --- 382,384 ---- ! def_val = XGetDefault(display, def_env, "SelectionSpread"); if (def_val != NULL) s_spread = atof(def_val);