diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-03 19:24:22 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-03 19:24:22 +0000 |
| commit | 0884e2ba0de126599e212f8a98f06d3a1df7a609 (patch) | |
| tree | 08d6569b31711561cf4788f830ada150f288d343 /src/Fl_Button.cxx | |
| parent | d3acd6c475de7fb811c4bde93ca735e3526ad82f (diff) | |
Update all non-text widgets that take keyboard focus to check
Fl::visible_focus() before taking or accepting focus; this allows
one to disable the new 1.1 keyboard focus stuff completely (not much
sense allowing focus if you can't see it...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1679 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Button.cxx')
| -rw-r--r-- | src/Fl_Button.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx index c1940b3b5..5a013bfa3 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.4 2001/08/04 20:17:10 easysw Exp $" +// "$Id: Fl_Button.cxx,v 1.4.2.6.2.5 2001/11/03 19:24:22 easysw Exp $" // // Button widget for the Fast Light Tool Kit (FLTK). // @@ -66,7 +66,7 @@ int Fl_Button::handle(int event) { return 1; case FL_PUSH: case FL_DRAG: - take_focus(); + if (Fl::visible_focus()) take_focus(); if (Fl::event_inside(this)) { if (type() == FL_RADIO_BUTTON) newval = 1; else newval = !oldval; @@ -107,8 +107,10 @@ int Fl_Button::handle(int event) { return 1; case FL_FOCUS : case FL_UNFOCUS : - redraw(); - return 1; + if (Fl::visible_focus()) { + redraw(); + return 1; + } else return 0; case FL_KEYBOARD : if (Fl::focus() == this && Fl::event_key() == ' ') { if (type() == FL_RADIO_BUTTON && !value_) { @@ -136,5 +138,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.4 2001/08/04 20:17:10 easysw Exp $". +// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.5 2001/11/03 19:24:22 easysw Exp $". // |