Fix focus "bug" - Fl_Button didn't check to see if the widget would

accept keyboard focus before taking focus when clicked on.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1981 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

CHANGES

@@ -1,5 +1,7 @@
 CHANGES IN FLTK 1.1.0b12
 
+	- Fl_Button didn't check to see if the widget could
+	  accept focus before taking input focus.
 	- Fl_Help_View didn't preserve target names (e.g.
 	  "filename.html#target") when following links.
 	- Drag-and-drop support for MacOS.

src/Fl_Button.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Button.cxx,v 1.4.2.6.2.10 2002/01/01 15:11:30 easysw Exp $"
+// "$Id: Fl_Button.cxx,v 1.4.2.6.2.11 2002/03/05 00:46:39 easysw Exp $"
 //
 // Button widget for the Fast Light Tool Kit (FLTK).
 //
@@ -66,7 +66,7 @@ int Fl_Button::handle(int event) {
 //  if ((value_?selection_color():color())==FL_GRAY) redraw();
     return 1;
   case FL_PUSH:
-    if (Fl::visible_focus()) Fl::focus(this);
+    if (Fl::visible_focus() && handle(FL_FOCUS)) Fl::focus(this);
   case FL_DRAG:
     if (Fl::event_inside(this)) {
       if (type() == FL_RADIO_BUTTON) newval = 1;
@@ -149,5 +149,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.10 2002/01/01 15:11:30 easysw Exp $".
+// End of "$Id: Fl_Button.cxx,v 1.4.2.6.2.11 2002/03/05 00:46:39 easysw Exp $".
 //