changeset 9236:9940e9b2a725 v7.4.1901

commit https://github.com/vim/vim/commit/762f1754370a1278167c8cba6c047ef319fc099c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 4 22:36:17 2016 +0200 patch 7.4.1901 Problem: Win32: the "Disabled" menu items would appear enabled. Solution: Use submenu_id if there is a parent. (Shane Harper, closes https://github.com/vim/vim/issues/834)
author Christian Brabandt <cb@256bit.org>
date Sat, 04 Jun 2016 22:45:05 +0200
parents 5006daf28c93
children 1c0fd34df5b3
files src/gui_w32.c src/version.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -7026,10 +7026,8 @@ gui_mch_menu_grey(
     }
     else
 #endif
-    if (grey)
-	EnableMenuItem(s_menuBar, menu->id, MF_BYCOMMAND | MF_GRAYED);
-    else
-	EnableMenuItem(s_menuBar, menu->id, MF_BYCOMMAND | MF_ENABLED);
+    (void)EnableMenuItem(menu->parent ? menu->parent->submenu_id : s_menuBar,
+		    menu->id, MF_BYCOMMAND | (grey ? MF_GRAYED : MF_ENABLED));
 
 #ifdef FEAT_TEAROFF
     if ((menu->parent != NULL) && (IsWindow(menu->parent->tearoff_handle)))
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1901,
+/**/
     1900,
 /**/
     1899,