Fix WB Sound Options greyout and remove some grossness

The sound and ICS Options menu items in WB were accessed 'by position',
with fixed defined positions (always messing up any reorganization of
the menus when you forgot to redefine the position constants in
winboard.h). And not only that, but for completely mysterious reasons,
the greying of the sound item greyed out the game-list options (above
it) in stead when it was defined as 9, and the ICS options (below it)
when it was 10 !!!. Now they are addressed 'by command' (and the
position definitions are removed), which fixes things.

diff --git a/winboard/winboard.c b/winboard/winboard.c
index c722994..a04d77f 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -7851,6 +7851,7 @@ Enables ncpEnables[] = {
   { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },\r
   { IDM_Engine1Options, MF_BYCOMMAND|MF_GRAYED },\r
   { IDM_Engine2Options, MF_BYCOMMAND|MF_GRAYED },\r
+  { IDM_Sounds, MF_BYCOMMAND|MF_GRAYED },\r
   { -1, -1 }\r
 };\r
 \r
@@ -8034,8 +8035,8 @@ SetICSMode()
 {\r
   HMENU hmenu = GetMenu(hwndMain);\r
   SetMenuEnables(hmenu, icsEnables);\r
-  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), ICS_POS,\r
-    MF_BYPOSITION|MF_ENABLED);\r
+  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), IDM_IcsOptions,\r
+    MF_BYCOMMAND|MF_ENABLED);\r
 #if ZIPPY\r
   if (appData.zippyPlay) {\r
     SetMenuEnables(hmenu, zippyEnables);\r
@@ -8057,8 +8058,6 @@ SetNCPMode()
 {\r
   HMENU hmenu = GetMenu(hwndMain);\r
   SetMenuEnables(hmenu, ncpEnables);\r
-  EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), SOUNDS_POS,\r
-    MF_BYPOSITION|MF_GRAYED);\r
     DrawMenuBar(hwndMain);\r
 }\r
 \r

diff --git a/winboard/winboard.h b/winboard/winboard.h
index 932ae66..7b14b7e 100644 (file)
--- a/winboard/winboard.h
+++ b/winboard/winboard.h
@@ -149,8 +149,6 @@ void SaveSettings(char* name);
 /* It's gross that these are needed. */\r
 #define ACTION_POS 4    /* Posn of "Action" on menu bar */\r
 #define OPTIONS_POS 6   /* Posn of "Options" on menu bar */\r
-#define ICS_POS 12      /* Posn of "ICS " on Options menu */\r
-#define SOUNDS_POS 11    /* Posn of "Sounds" on Options menu */\r
 /* end grossness */\r
 \r
 extern MyFont *font[NUM_SIZES][NUM_FONTS];\r