From d8f2950729b7b10a234338e69f5059074ff10a66 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Sun, 11 Jan 2015 21:56:27 +0000 Subject: [PATCH] * Source/NSMenu.m (-update): Added case to menu autoenabler to disable supermenus that have empty submenus, when there is no validator. Patch by Paul Landers . git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38289 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ Source/NSMenu.m | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1d58f5a28..0b391d866 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-01-11 Fred Kiefer + + * Source/NSMenu.m (-update): Added case to menu autoenabler to + disable supermenus that have empty submenus, when there is no + validator. + Patch by Paul Landers . + 2015-01-11 Fred Kiefer * Source/NSTextView.m: Fix bizarre behavior with undo/redo diff --git a/Source/NSMenu.m b/Source/NSMenu.m index 96b2173f6..8ea08bee4 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -1192,7 +1192,11 @@ static BOOL menuBarVisible = YES; { shouldBeEnabled = [validator validateUserInterfaceItem: item]; } - else + else if ([item hasSubmenu] && [[item submenu] numberOfItems] == 0) + { + shouldBeEnabled = NO; + } + else { shouldBeEnabled = YES; }