X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xaw%2Fxoptions.c;h=1809743f9cccc6189ef05644493a0d46ad6c7c00;hb=2eb3eb048b16f2ffd1f1c8dad3987871b0f9bd72;hp=e183cf2f37f8826fde5b8b39bb84a6cac1935367;hpb=ca218df6e665995a11015980f86003d915de9812;p=xboard.git

diff --git a/xaw/xoptions.c b/xaw/xoptions.c
index e183cf2..1809743 100644
--- a/xaw/xoptions.c
+++ b/xaw/xoptions.c
@@ -1,7 +1,7 @@
 /*
  * xoptions.c -- Move list window, part of X front end for XBoard
  *
- * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -189,6 +189,12 @@ SetWidgetLabel (Option *opt, char *buf)
 }
 
 void
+SetComboChoice (Option *opt, char *n)
+{
+    SetWidgetText(opt, opt->choice[n]);
+}
+
+void
 SetDialogTitle (DialogClass dlg, char *title)
 {
     Arg args[16];
@@ -285,7 +291,7 @@ Show (Option *opt, int hide)
     Dimension v;
     int j=0;
 return; // FIXME: it would be nice if the Chat window did have an ICS pane we could hide behind
-printf("Show(%d) %x\n", hide, opt->handle);
+//printf("Show(%d) %x\n", hide, opt->handle);
     if(!opt->handle) return;
     if(hide) { // make sure original size is saved
       XtSetArg(args[j], XtNheight, &v); j++;
@@ -1129,7 +1135,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 	    j = SetPositionAndSize(args, last, lastrow, 3 /* border */,
 				   option[i].max /* w */, shrink ? textHeight : 0 /* h */, option[i].min & 0xE | chain /* chain */);
 	    XtSetArg(args[j], XtNlabel, _(option[i].name));  j++;
-	    if(option[i].textValue) { // special for buttons of New Variant dialog
+	    if(option[i].textValue && *option[i].textValue == '#') { // special for buttons of New Variant dialog
 		XtSetArg(args[j], XtNsensitive, option[i].value >= 0 && (appData.noChessProgram
 					 || strstr(first.variants, VariantName(option[i].value)))); j++;
 		XtSetArg(args[j], XtNborderWidth, (gameInfo.variant == option[i].value)+1); j++;
@@ -1141,7 +1147,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 */,