From 0884e2ba0de126599e212f8a98f06d3a1df7a609 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 3 Nov 2001 19:24:22 +0000 Subject: 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 --- src/Fl_Choice.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/Fl_Choice.cxx') diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index fef598b63..bc79d6f6b 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.2 2001/09/29 22:59:45 easysw Exp $" +// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.3 2001/11/03 19:24:22 easysw Exp $" // // Choice widget for the Fast Light Tool Kit (FLTK). // @@ -89,7 +89,7 @@ int Fl_Choice::handle(int e) { case FL_KEYBOARD: if (Fl::event_key() != ' ') return 0; case FL_PUSH: - take_focus(); + if (Fl::visible_focus()) take_focus(); Fl::event_is_click(0); J1: v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this); @@ -106,13 +106,15 @@ int Fl_Choice::handle(int e) { return 1; case FL_FOCUS: case FL_UNFOCUS: - redraw(); - return 1; + if (Fl::visible_focus()) { + redraw(); + return 1; + } else return 0; default: return 0; } } // -// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.2 2001/09/29 22:59:45 easysw Exp $". +// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.3 2001/11/03 19:24:22 easysw Exp $". // -- cgit v1.2.3