diff options
Diffstat (limited to 'src/Fl_Button.cxx')
| -rw-r--r-- | src/Fl_Button.cxx | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx index 8484db7d6..1651d08f5 100644 --- a/src/Fl_Button.cxx +++ b/src/Fl_Button.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Button widget for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2014 by Bill Spitzak and others. @@ -9,11 +7,11 @@ // the file "COPYING" which should have been included with this file. If this // file is missing or damaged, see the license at: // -// http://www.fltk.org/COPYING.php +// https://www.fltk.org/COPYING.php // -// Please report all bugs and problems on the following page: +// Please see the following page on how to report bugs and issues: // -// http://www.fltk.org/str.php +// https://www.fltk.org/bugs.php // #include <FL/Fl.H> @@ -117,7 +115,7 @@ int Fl_Button::handle(int event) { value(oldval); set_changed(); if (when() & FL_WHEN_CHANGED) { - Fl_Widget_Tracker wp(this); + Fl_Widget_Tracker wp(this); do_callback(); if (wp.deleted()) return 1; } @@ -126,19 +124,19 @@ int Fl_Button::handle(int event) { return 1; case FL_SHORTCUT: if (!(shortcut() ? - Fl::test_shortcut(shortcut()) : test_shortcut())) return 0; + Fl::test_shortcut(shortcut()) : test_shortcut())) return 0; if (Fl::visible_focus() && handle(FL_FOCUS)) Fl::focus(this); goto triggered_by_keyboard; case FL_FOCUS : case FL_UNFOCUS : if (Fl::visible_focus()) { if (box() == FL_NO_BOX) { - // Widgets with the FL_NO_BOX boxtype need a parent to - // redraw, since it is responsible for redrawing the - // background... - int X = x() > 0 ? x() - 1 : 0; - int Y = y() > 0 ? y() - 1 : 0; - if (window()) window()->damage(FL_DAMAGE_ALL, X, Y, w() + 2, h() + 2); + // Widgets with the FL_NO_BOX boxtype need a parent to + // redraw, since it is responsible for redrawing the + // background... + int X = x() > 0 ? x() - 1 : 0; + int Y = y() > 0 ? y() - 1 : 0; + if (window()) window()->damage(FL_DAMAGE_ALL, X, Y, w() + 2, h() + 2); } else redraw(); return 1; } else return 0; @@ -151,12 +149,12 @@ int Fl_Button::handle(int event) { Fl_Widget_Tracker wp(this); if (type() == FL_RADIO_BUTTON) { if (!value_) { - setonly(); - if (when() & FL_WHEN_CHANGED) do_callback(); + setonly(); + if (when() & FL_WHEN_CHANGED) do_callback(); } } else if (type() == FL_TOGGLE_BUTTON) { - value(!value()); - if (when() & FL_WHEN_CHANGED) do_callback(); + value(!value()); + if (when() & FL_WHEN_CHANGED) do_callback(); } else { simulate_key_action(); } @@ -246,8 +244,3 @@ Fl_Toggle_Button::Fl_Toggle_Button(int X,int Y,int W,int H,const char *L) { type(FL_TOGGLE_BUTTON); } - - -// -// End of "$Id$". -// |