From 95a022cfa232e2d7b0a94949d0cf5d898c1de158 Mon Sep 17 00:00:00 2001 From: H.G.Muller Date: Thu, 11 Sep 2014 12:41:50 +0200 Subject: [PATCH] Fix Xaw button color error The textValue field, now also used to indicate font, was used in two places when popping up buttons, and the font patch only addressed one. --- xaw/xoptions.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xaw/xoptions.c b/xaw/xoptions.c index adfedf9..9d59f4c 100644 --- a/xaw/xoptions.c +++ b/xaw/xoptions.c @@ -1141,7 +1141,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent XtAddEventHandler(option[i-1].handle, KeyReleaseMask, False, ColorChanged, (XtPointer)(intptr_t) i-1); } XtAddCallback(last, XtNcallback, GenericCallback, (XtPointer)(intptr_t) i + (dlgNr<<16)); // invokes user callback - if(option[i].textValue) SetColor( option[i].textValue, &option[i]); // for new-variant buttons + if(option[i].textValue && *option[i].textValue == '#') SetColor( option[i].textValue, &option[i]); // for new-variant buttons break; case ComboBox: j = SetPositionAndSize(args, last, lastrow, 0 /* border */, -- 1.7.0.4