diff options
| author | Sebastian Geerken <devnull@localhost> | 2012-09-14 11:34:19 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2012-09-14 11:34:19 +0200 |
| commit | e4367b16dc131f34936bbb8fd09557b5aa5acbd7 (patch) | |
| tree | 487a35941bf20bbc95a3d0b1dee420b00771f5b6 /dw/fltkcomplexbutton.cc | |
| parent | abd446c2eebe1f96764b6d95f1c6c61ae9bc40b2 (diff) | |
| parent | 94e451ffa5ece79a3b071ee553650bf8bd869a46 (diff) | |
Merge of <http://hg.dillo.org/dillo>.
Diffstat (limited to 'dw/fltkcomplexbutton.cc')
| -rw-r--r-- | dw/fltkcomplexbutton.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dw/fltkcomplexbutton.cc b/dw/fltkcomplexbutton.cc index 89295190..0f124cf9 100644 --- a/dw/fltkcomplexbutton.cc +++ b/dw/fltkcomplexbutton.cc @@ -1,5 +1,6 @@ -// fltkcomplexbutton.cc contains code from FLTK 1.3's src/Fl_Button.cxx -// that is Copyright 1998-2010 by Bill Spitzak and others. +// fltkcomplexbutton.cc is derived from src/Fl_Button.cxx from FLTK's 1.3 +// branch at http://fltk.org in early 2011. +// src/Fl_Button.cxx is Copyright 1998-2010 by Bill Spitzak and others. /* * This program is free software; you can redistribute it and/or modify @@ -108,7 +109,8 @@ int ComplexButton::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_key() == FL_Enter) && !(Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) { set_changed(); Fl_Widget_Tracker wp(this); |