X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xaw%2Fxoptions.c;h=021da535e198201279193857f128399697fd5b7d;hb=1e073d7e7d24716130abdcf37711de64aa06ecd7;hp=153ca4368cac2b65b0e94586792739b8025bb76f;hpb=acceebbe37c9c4ad05f74dbfaf327d20171c874f;p=xboard.git

diff --git a/xaw/xoptions.c b/xaw/xoptions.c
index 153ca43..021da53 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, 2015 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -189,9 +189,9 @@ SetWidgetLabel (Option *opt, char *buf)
 }
 
 void
-SetComboChoice (Option *opt, char *n)
+SetComboChoice (Option *opt, int n)
 {
-    SetWidgetText(opt, opt->choice[n]);
+    SetWidgetText(opt, opt->choice[n], MasterDlg);
 }
 
 void
@@ -1225,6 +1225,11 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 				   0 /* w */, 0 /* h */, 1 /* chain (always on same row) */);
 	    forelast = lastrow;
 	    msg = _(option[i].name); // write name on the menu button
+	    if(msg) { if(*msg == '_') msg++; else if(msg[1] == '_') { // kludge to remove GTK shortkut-key indicators
+		static char buf[MSG_SIZ];
+		strncpy(buf, msg, MSG_SIZ); msg = buf + 1;
+		*msg = *buf;
+	    }}
 	    XtSetArg(args[j], XtNmenuName, XtNewString(option[i].name));  j++;
 	    XtSetArg(args[j], XtNlabel, msg);  j++;
 	    option[i].handle = (void*)