diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-11-11 20:22:21 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-11-11 20:22:21 +0000 |
| commit | 7327b740325b0f14be780797408c5fc88d36fae4 (patch) | |
| tree | 598a205190c1c6cee72a6286ebb9cb9c78a400fe /src/Fl_Menu_Button.cxx | |
| parent | bf9a09d387da05741be44239ade4c1ca0b3dade4 (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_Menu_Button.cxx')
| -rw-r--r-- | src/Fl_Menu_Button.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Fl_Menu_Button.cxx b/src/Fl_Menu_Button.cxx index 203150de2..1afbc7b39 100644 --- a/src/Fl_Menu_Button.cxx +++ b/src/Fl_Menu_Button.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Button.cxx,v 1.4.2.3.2.5 2002/09/01 22:39:33 easysw Exp $" +// "$Id: Fl_Menu_Button.cxx,v 1.4.2.3.2.6 2002/11/11 20:22:21 easysw Exp $" // // Menu button widget for the Fast Light Tool Kit (FLTK). // @@ -70,7 +70,8 @@ int Fl_Menu_Button::handle(int e) { return 1; case FL_KEYBOARD: if (!box()) return 0; - if (Fl::event_key() == ' ') { + if (Fl::event_key() == ' ' && + !(Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) { popup(); return 1; } else return 0; @@ -94,5 +95,5 @@ Fl_Menu_Button::Fl_Menu_Button(int X,int Y,int W,int H,const char *l) } // -// End of "$Id: Fl_Menu_Button.cxx,v 1.4.2.3.2.5 2002/09/01 22:39:33 easysw Exp $". +// End of "$Id: Fl_Menu_Button.cxx,v 1.4.2.3.2.6 2002/11/11 20:22:21 easysw Exp $". // |