X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=d1420ed5edeb21c9e07df0390d684e1c3e3f2472;hb=d266628116c7f359e6677f9b2f3658d87634f251;hp=1ce5442848be55c829b1b72c9d5dbe086cc3a448;hpb=3cc857b122a0529be670b5615f7859c0cd7af947;p=xboard.git

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index 1ce5442..d1420ed 100644
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -52,7 +52,7 @@ extern char *getenv();
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #ifdef OSXAPP
-#  include <gtkmacintegration/gtkosxapplication.h>
+#  include <gtkmacintegration-gtk2/gtkosxapplication.h>
 #endif
 
 #include "common.h"
@@ -1435,7 +1435,7 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
 		g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]);
 		gtk_widget_set_sensitive(label, TRUE);
 	    }
-            Pack(hbox, table, label, left, left+3, top, 0);
+            Pack(hbox, table, label, left, left+r, top, 0);
 	    break;
           case SaveButton:
           case Button:
@@ -1568,7 +1568,11 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
 	    top--;
 	    msg = _(option[i].name); // write name on the menu button
 #ifndef OSXAPP
-	    if(tinyLayout) { strcpy(def, msg); def[tinyLayout] = NULLCHAR; msg = def; } // clip menu text to keep menu bar small
+	    if(tinyLayout) { // clip menu text to keep menu bar small
+		int clip = tinyLayout + 1;
+		strcpy(def, msg + (msg[clip-1] == '_'));
+		def[clip] = NULLCHAR; msg = def;
+	    }
 #endif
 //	    XtSetArg(args[j], XtNmenuName, XtNewString(option[i].name));  j++;
 //	    XtSetArg(args[j], XtNlabel, msg);  j++;