summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-01-16 23:22:32 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-01-16 23:22:32 +0000
commit42a6245bdd5bf7fa3a03f1cd82b1c7013c5be7c9 (patch)
tree8bf78862fa36e5cf9a00a0fd75ef156ba6deb7a2 /src
parent1a12cf01d2cd26eebc58a37d1bca548b8283c07d (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
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Menu.cxx5
1 files changed, 4 insertions, 1 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