Fix Edit Game/Position checkmarking in WinBoard

Because the entries in Edit and Mode menu were pure duplicats, the
entries in the wrong menu (Edit) were checkmarked while active. By
defining different IDs for those in the Edit menu, those in the Mode
menu are checkmarked again.

diff --git a/winboard/resource.h b/winboard/resource.h
index e063e42..33b3875 100644 (file)
--- a/winboard/resource.h
+++ b/winboard/resource.h
@@ -31,6 +31,8 @@
 #define IDM_TimeControl                 131\r
 #define IDM_LoadOptions                 132\r
 #define IDM_SaveOptions                 133\r
+#define IDM_EditGame2                   134\r
+#define IDM_EditPosition2               135\r
 #define IDM_CommPort                    147\r
 #define IDM_EditComment                 148\r
 #define IDM_LoadNextGame                149\r

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 24fa20e..ad257f9 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4904,11 +4904,13 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;\r
 \r
     case IDM_EditGame:\r
+    case IDM_EditGame2:\r
       EditGameEvent();\r
       SAY("edit game");\r
       break;\r
 \r
     case IDM_EditPosition:\r
+    case IDM_EditPosition2:\r
       EditPositionEvent();\r
       SAY("enter a FEN string or setup a position on the board using the control R pop up menu");\r
       break;\r

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index ca8624f..5bda4ec 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -1131,8 +1131,8 @@ BEGIN
         MENUITEM "P&aste Position From Clipboard\tCtrl+Shift+V", \r
                                                 IDM_PasteAny\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame\r
-        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition\r
+        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame2\r
+        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition2\r
         MENUITEM SEPARATOR\r
         MENUITEM "Edit Ta&gs...",               IDM_EditTags\r
         MENUITEM "Edit &Comment...",            IDM_EditComment\r