diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2006-01-16 23:22:32 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2006-01-16 23:22:32 +0000 |
| commit | 42a6245bdd5bf7fa3a03f1cd82b1c7013c5be7c9 (patch) | |
| tree | 8bf78862fa36e5cf9a00a0fd75ef156ba6deb7a2 | |
| parent | 1a12cf01d2cd26eebc58a37d1bca548b8283c07d (diff) | |
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
| -rw-r--r-- | src/Fl_Menu.cxx | 5 | ||||
| -rw-r--r-- | 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'}, |