summaryrefslogtreecommitdiff
path: root/src/Fl_Button.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_Button.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_Button.cxx')
-rw-r--r--src/Fl_Button.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx
index e5da503f3..0cbf86453 100644
--- a/src/Fl_Button.cxx
+++ b/src/Fl_Button.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Button.cxx,v 1.4.2.6.2.18 2002/10/10 20:08:16 easysw Exp $"
+// "$Id: Fl_Button.cxx,v 1.4.2.6.2.19 2002/11/11 20:22:21 easysw Exp $"
//
// Button widget for the Fast Light Tool Kit (FLTK).
//
@@ -129,7 +129,8 @@ int Fl_Button::handle(int event) {
return 1;
} else return 0;
case FL_KEYBOARD :
- if (Fl::focus() == this && Fl::event_key() == ' ') {
+ if (Fl::focus() == this && Fl::event_key() == ' ' &&
+ !(Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) {
if (type() == FL_RADIO_BUTTON && !value_) {
setonly();
if (when() & FL_WHEN_CHANGED) do_callback();
@@ -155,5 +156,5 @@ Fl_Button::Fl_Button(int X, int Y, int W, int H, const char *l)
}
//
-// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.18 2002/10/10 20:08:16 easysw Exp $".
+// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.19 2002/11/11 20:22:21 easysw Exp $".
//