X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=f29eb15f6a9386dcee119f2c4785c80b82021a63;hb=e70077aab0199817f37aef9ed0bdba1bbca93b45;hp=9b5e5a1f6c0d249d4359cd6dbb0a68b50b480880;hpb=6219a281a50fa6e783456477c5121235cbf80c19;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 9b5e5a1..f29eb15 100644
--- a/xboard.c
+++ b/xboard.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -1115,8 +1115,8 @@ char globalTranslations[] =
    "\
    :<Key>F1: ManProc() \n \
    :<Key>F2: FlipViewProc() \n \
-   :Ctrl<KeyDown>.: TempBackwardProc() \n \
-   :Ctrl<KeyUp>.: TempForwardProc() \n \
+   :<KeyDown>Return: TempBackwardProc() \n \
+   :<KeyUp>Return: TempForwardProc() \n \
    :Ctrl<Key>1: AskQuestionProc(\"Direct command\",\
                                 \"Send to chess program:\",,1) \n \
    :Ctrl<Key>2: AskQuestionProc(\"Direct command\",\
@@ -3974,16 +3974,7 @@ Widget CreateMenuBar(mb, boardWidth)
 	strncat(menuName, mb->ref, MSG_SIZ - strlen(menuName) - 1);
 	j = 0;
 	XtSetArg(args[j], XtNmenuName, XtNewString(menuName));  j++;
-	if (tinyLayout) {
-	    char shortName[2];
-            shortName[0] = mb->name[0];
-	    shortName[1] = NULLCHAR;
-	    XtSetArg(args[j], XtNlabel, XtNewString(shortName)); j++;
-	}
-      else {
-	XtSetArg(args[j], XtNlabel, XtNewString(_(mb->name))); j++;
-      }
-
+	XtSetArg(args[j], XtNlabel, XtNewString(_(mb->name)));  j++;
 	XtSetArg(args[j], XtNborderWidth, 0);                   j++;
 	mb->subMenu = XtCreateManagedWidget(mb->name, menuButtonWidgetClass,
 				       menuBar, args, j);