Alexandre Julliard : hhctrl: Don't use an extended menu.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d38571a67a7ba200f84ef79be48f8ebcd772e6ed
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d38571a67a7ba200f84ef79be4...

Author: Alexandre Julliard 
Date:   Wed Jan 19 23:45:34 2011 +0100

hhctrl: Don't use an extended menu.

---

dlls/hhctrl.ocx/help.c    |    4 +++-
 dlls/hhctrl.ocx/hhctrl.rc |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index d8725b1..4a0f78b 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -685,7 +685,9 @@ static void DisplayPopupMenu(HHInfo *info)

/* Update the Show/Hide menu item */
     item.cbSize = sizeof(MENUITEMINFOW);
-    item.fMask = MIIM_STRING;
+    item.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_STRING;
+    item.fType = MFT_STRING;
+    item.fState = MF_ENABLED;

if (info->WinType.fNotExpanded)
         item.dwTypeData = HH_LoadString(IDS_SHOWTABS);
diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc
index 562a96b..89ba97f 100644
--- a/dlls/hhctrl.ocx/hhctrl.rc
+++ b/dlls/hhctrl.ocx/hhctrl.rc
@@ -62,7 +62,7 @@ BEGIN
     IDTB_TOC_PREV    "IDTB_TOC_PREV"
 END

-MENU_POPUP MENUEX
+MENU_POPUP MENU
 {
     POPUP "Options"
     {