X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=b3c88c442f8b01acf0f7f82cc6f53b09a932bdf8;hb=39d79ffb3def5d8ac66c02dd97245a13d89ba8eb;hp=dc525dc4d7ca7ddec4d96c7068249dfa4fc4b982;hpb=1383f5acee09efd2d21ac20bb47fbc15b475ecd5;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index dc525dc..b3c88c4 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -709,8 +709,8 @@ SetPositionAndSize (Arg *args, Widget leftNeigbor, Widget topNeigbor, int b, int
     if(!appData.monoMode) {
 	if(!b && appData.dialogColor[0]) XtSetArg(args[j], XtNbackground, dialogColor),  j++;
 	if(b == 3 && appData.buttonColor[0]) XtSetArg(args[j], XtNbackground, buttonColor),  j++;
-	if(b == 3) b = 1;
     }
+    if(b == 3) b = 1;
     // border
     XtSetArg(args[j], XtNborderWidth, b);  j++;
     return j;
@@ -883,7 +883,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 #if ENABLE_NLS
 	    if(option[i].choice) XtSetArg(args[j], XtNfontSet, *(XFontSet*)option[i].choice), j++;
 #else
-	    if(option[i].choice) XtSetArg(args[j], XtNfont, *(XFontStruct*)option[i].choice), j++;
+	    if(option[i].choice) XtSetArg(args[j], XtNfont, (XFontStruct*)option[i].choice), j++;
 #endif
 	    XtSetArg(args[j], XtNresizable, False);  j++;
 	    XtSetArg(args[j], XtNjustify, XtJustifyLeft);  j++;
@@ -1153,7 +1153,7 @@ SetInsertPos (Option *opt, int pos)
     XtSetArg(args[0], XtNinsertPosition, pos);
     XtSetValues(opt->handle, args, 1);
 //    SetFocus(opt->handle, shells[InputBoxDlg], NULL, False); // No idea why this does not work, and the following is needed:
-    XSetInputFocus(xDisplay, XtWindow(opt->handle), RevertToPointerRoot, CurrentTime);
+//    XSetInputFocus(xDisplay, XtWindow(opt->handle), RevertToPointerRoot, CurrentTime);
 }
 
 void