winhlp32: Remove the unimplemented help color and visibility menus.

[Francois Gouget]

---
 programs/winhlp32/winhelp.c     |    9 ---------
 programs/winhlp32/winhelp_res.h |    8 --------
 programs/winhlp32/winhlp32.rc   |   14 --------------
 3 files changed, 0 insertions(+), 31 deletions(-)

diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 5e4bce4..685b55a 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -1401,15 +1401,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */);
             }
             break;
-        case MNID_OPTS_HELP_DEFAULT:
-        case MNID_OPTS_HELP_VISIBLE:
-        case MNID_OPTS_HELP_NONVISIBLE:
-        case MNID_OPTS_SYSTEM_COLORS:
-        case MNID_CTXT_HELP_DEFAULT:
-        case MNID_CTXT_HELP_VISIBLE:
-        case MNID_CTXT_HELP_NONVISIBLE:
-        case MNID_CTXT_SYSTEM_COLORS:
-            /* FIXME: NIY */
 
 	default:
             /* Buttons */
diff --git a/programs/winhlp32/winhelp_res.h b/programs/winhlp32/winhelp_res.h
index a6d1830..92a4863 100644
--- a/programs/winhlp32/winhelp_res.h
+++ b/programs/winhlp32/winhelp_res.h
@@ -11,14 +11,10 @@
 
 #define MNID_BKMK_DEFINE        0x121
 
-#define MNID_OPTS_HELP_DEFAULT  0x131
-#define MNID_OPTS_HELP_VISIBLE  0x132
-#define MNID_OPTS_HELP_NONVISIBLE 0x133
 #define MNID_OPTS_HISTORY       0x134
 #define MNID_OPTS_FONTS_SMALL   0x135
 #define MNID_OPTS_FONTS_NORMAL  0x136
 #define MNID_OPTS_FONTS_LARGE   0x137
-#define MNID_OPTS_SYSTEM_COLORS 0x138
 
 #define MNID_HELP_HELPON        0x141
 #define MNID_HELP_HELPTOP       0x142
@@ -30,10 +26,6 @@
 #define MNID_CTXT_FONTS_SMALL   0x210
 #define MNID_CTXT_FONTS_NORMAL  0x211
 #define MNID_CTXT_FONTS_LARGE   0x212
-#define MNID_CTXT_HELP_DEFAULT  0x220
-#define MNID_CTXT_HELP_VISIBLE  0x221
-#define MNID_CTXT_HELP_NONVISIBLE 0x222
-#define MNID_CTXT_SYSTEM_COLORS 0x230
 
 #define MAIN_MENU		0xF000
 #define CONTEXT_MENU            0xF001
diff --git a/programs/winhlp32/winhlp32.rc b/programs/winhlp32/winhlp32.rc
index afc9c46..8d3acaf 100644
--- a/programs/winhlp32/winhlp32.rc
+++ b/programs/winhlp32/winhlp32.rc
@@ -42,12 +42,6 @@ MAIN_MENU MENU
    MENUITEM "&Define...", MNID_BKMK_DEFINE
  }
  POPUP "&Options" {
-   POPUP	"Help always visible"
-   BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
-  END
   MENUITEM "History",		MNID_OPTS_HISTORY
   POPUP    "Fonts"
   BEGIN
@@ -55,7 +49,6 @@ MAIN_MENU MENU
     MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
     MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "&Help" {
    MENUITEM "&Help on help", MNID_HELP_HELPON
@@ -78,13 +71,6 @@ BEGIN
 			MENUITEM "Normal",      MNID_CTXT_FONTS_NORMAL
 			MENUITEM "Large",       MNID_CTXT_FONTS_LARGE
 		END
-		POPUP   "Help always visible"
-		BEGIN
-			MENUITEM "Default",     MNID_CTXT_HELP_DEFAULT
-			MENUITEM "Visible",     MNID_CTXT_HELP_VISIBLE
-			MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE
-		END
-		MENUITEM "Use system colors",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
 
-- 
1.7.4.1