X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fjaws.c;h=aa843ad083148bab9714ed688276a4a4d972fd7b;hb=HEAD;hp=d5b5b278b0607635599620da5c02210f197a21be;hpb=b382d988c6f886f3a49483df9e3e36de0b6b0824;p=xboard.git

diff --git a/winboard/jaws.c b/winboard/jaws.c
index d5b5b27..aa843ad 100644
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -5,7 +5,8 @@
  * 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, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * XBoard borrows its colors and the bitmaps.xchess bitmap set from XChess,
  * which was written and is copyrighted by Wayne Christopher.
@@ -270,7 +271,7 @@ InitJAWS()
 
 		AdaptMenu();
 		menuBarText[0][8] = menuBarText[0][7]; menuBarText[0][7] = "&JAWS";
-		for(i=0; i<9; i++) menuBarText[1][i] = menuBarText[0][i];
+		for(i=0; i<9; i++) menuBarText[2][i] = menuBarText[1][i] = menuBarText[0][i];
 	}
 
 	hAccelJAWS = CreateAcceleratorTable(acceleratorsJAWS, 14);
@@ -1240,9 +1241,8 @@ NiceTime(int x)
       }\
       return 0;\
 
-#define JAWS_KB_NAVIGATION \
+#define JAWS_KBDOWN_NAVIGATION \
 \
-	case WM_KEYDOWN:\
 \
 		if(GetKeyState(VK_MENU) < 0 && GetKeyState(VK_CONTROL) < 0) {\
 		    /* Control + Alt + letter used for speaking piece positions */\
@@ -1279,14 +1279,13 @@ NiceTime(int x)
 			KeyboardMove(hwnd, message, wParam, lParam);\
 			break;\
 		}\
-		break;\
-	case WM_KEYUP:\
+
+#define JAWS_KBUP_NAVIGATION \
 		switch (wParam) {\
 		case VK_SPACE:\
 			KeyboardMove(hwnd, message, wParam, lParam);\
 			break;\
 		}\
-		break;\
 
 #define JAWS_MENU_ITEMS \
 		case IDM_PossibleAttackMove:  /*What can I possible attack from here */\