From 42a6245bdd5bf7fa3a03f1cd82b1c7013c5be7c9 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Mon, 16 Jan 2006 23:22:32 +0000
Subject: [PATCH] STR #1109 re-fix: when fixing 1109, I accidentally enabled
 clicking on grayed out menu items. This commit should fix that an make the
 menu ignore grayed out items altogether.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4763 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Menu.cxx  | 5 ++++-
 test/menubar.cxx | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index ea909bbf4..4e860e396 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -613,7 +613,10 @@ int menuwindow::handle(int e) {
   case FL_RELEASE:
     // do nothing if they try to pick inactive items
     if (pp.current_item && !pp.current_item->activevisible()) {
-      pp.state = DONE_STATE;
+      if (pp.state==INITIAL_STATE) {
+        setitem(0, -1, 0);
+        pp.state = DONE_STATE;
+      }
       return 1;
     }
     // Mouse must either be held down/dragged some, or this must be
diff --git a/test/menubar.cxx b/test/menubar.cxx
index e0de89a9b..92eee5796 100644
--- a/test/menubar.cxx
+++ b/test/menubar.cxx
@@ -160,7 +160,7 @@ Fl_Menu_Item pulldown[] = {
   {"Red",	FL_ALT+'r'},
   {"Green",	FL_ALT+'g'},
   {"Blue",	FL_ALT+'b'},
-  {"Strange",	FL_ALT+'s'},
+  {"Strange",	FL_ALT+'s', 0, 0, FL_MENU_INACTIVE},
   {"&Charm",	FL_ALT+'c'},
   {"Truth",	FL_ALT+'t'},
   {"Beauty",	FL_ALT+'b'},