From f09e17c3c564e8310125a10c03397cbf473ff643 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 1 Jul 2020 18:03:10 +0200 Subject: Remove $Id$ tags, update URL's, and more - remove obsolete svn '$Id$' tags from all source files - update .fl files and generated files accordingly - replace 'http://www.fltk.org' URL's with 'https://...' - replace bug report URL 'str.php' with 'bugs.php' - remove trailing whitespace - fix other whitespace errors flagged by Git - add and/or fix missing or wrong standard headers - convert tabs to spaces in all source files The only relevant code changes are in the fluid/ folder where some .fl files and other source files were used to generate the '$Id' headers and footers. --- src/Fl_Choice.cxx | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/Fl_Choice.cxx') diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index d12f473e3..20b374442 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Choice widget for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2015 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 @@ -26,17 +24,17 @@ // button: it draws the text of the current pick and a down-arrow. void Fl_Choice::draw() { - Fl_Boxtype btype = Fl::scheme() ? FL_UP_BOX // non-default uses up box - : FL_DOWN_BOX; // default scheme uses down box + Fl_Boxtype btype = Fl::scheme() ? FL_UP_BOX // non-default uses up box + : FL_DOWN_BOX; // default scheme uses down box int dx = Fl::box_dx(btype); int dy = Fl::box_dy(btype); // Arrow area int H = h() - 2 * dy; - int W = Fl::is_scheme("gtk+") ? 20 : // gtk+ -- fixed size - Fl::is_scheme("gleam") ? 20 : // gleam -- fixed size - Fl::is_scheme("plastic") ? ((H > 20) ? 20 : H) // plastic: shrink if H<20 - : ((H > 20) ? 20 : H); // default: shrink if H<20 + int W = Fl::is_scheme("gtk+") ? 20 : // gtk+ -- fixed size + Fl::is_scheme("gleam") ? 20 : // gleam -- fixed size + Fl::is_scheme("plastic") ? ((H > 20) ? 20 : H) // plastic: shrink if H<20 + : ((H > 20) ? 20 : H); // default: shrink if H<20 int X = x() + w() - W - dx; int Y = y() + dy; @@ -186,7 +184,7 @@ int Fl_Choice::handle(int e) { if (Fl::visible_focus()) Fl::focus(this); J1: if (Fl::scheme() - || fl_contrast(textcolor(), FL_BACKGROUND2_COLOR) != textcolor()) { + || fl_contrast(textcolor(), FL_BACKGROUND2_COLOR) != textcolor()) { v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this); if (wp.deleted()) return 1; } else { @@ -219,7 +217,3 @@ int Fl_Choice::handle(int e) { return 0; } } - -// -// End of "$Id$". -// -- cgit v1.2.3