summaryrefslogtreecommitdiff
path: root/src/Fl_Choice.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-11-11 20:22:21 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-11-11 20:22:21 +0000
commit7327b740325b0f14be780797408c5fc88d36fae4 (patch)
tree598a205190c1c6cee72a6286ebb9cb9c78a400fe /src/Fl_Choice.cxx
parentbf9a09d387da05741be44239ade4c1ca0b3dade4 (diff)
Don't popup menus or activate buttons when (SHIFT/CTRL/ALT/META) + space
is pressed. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2834 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Choice.cxx')
-rw-r--r--src/Fl_Choice.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx
index e7ca7224b..f6e9f6c1b 100644
--- a/src/Fl_Choice.cxx
+++ b/src/Fl_Choice.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.11 2002/08/09 01:09:48 easysw Exp $"
+// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.12 2002/11/11 20:22:21 easysw Exp $"
//
// Choice widget for the Fast Light Tool Kit (FLTK).
//
@@ -100,7 +100,8 @@ int Fl_Choice::handle(int e) {
return 1;
case FL_KEYBOARD:
- if (Fl::event_key() != ' ') return 0;
+ if (Fl::event_key() != ' ' ||
+ (Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) return 0;
case FL_PUSH:
if (Fl::visible_focus()) Fl::focus(this);
Fl::event_is_click(0);
@@ -129,5 +130,5 @@ int Fl_Choice::handle(int e) {
}
//
-// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.11 2002/08/09 01:09:48 easysw Exp $".
+// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.12 2002/11/11 20:22:21 easysw Exp $".
//