From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Thu, 11 Sep 2014 10:41:50 +0000 (+0200)
Subject: Fix Xaw button color error
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=95a022cfa232e2d7b0a94949d0cf5d898c1de158

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.
---

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 */,