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. --- test/unittest_schemes.cxx | 412 +++++++++++++++++++++++----------------------- 1 file changed, 203 insertions(+), 209 deletions(-) (limited to 'test/unittest_schemes.cxx') diff --git a/test/unittest_schemes.cxx b/test/unittest_schemes.cxx index 6c1d7273a..9f5123ca6 100644 --- a/test/unittest_schemes.cxx +++ b/test/unittest_schemes.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Unit tests for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2017 by Bill Spitzak and others. @@ -11,11 +9,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 @@ -50,8 +48,8 @@ class SchemesTest : public Fl_Group { SchemesTest *st = (SchemesTest*)data; const char *name = st->schemechoice->text(); if ( name ) { - Fl::scheme(name); // change scheme - st->window()->redraw(); // redraw window + Fl::scheme(name); // change scheme + st->window()->redraw(); // redraw window } } public: @@ -79,245 +77,245 @@ public: { // Pasted from Edmanuel's gleam test app { Fl_Button* o = new Fl_Button(10, 9, 90, 25, "button"); - o->box(FL_UP_BOX); - o->color((Fl_Color)101); - o->tooltip("selection_color() = default"); - o->labelfont(5); + o->box(FL_UP_BOX); + o->color((Fl_Color)101); + o->tooltip("selection_color() = default"); + o->labelfont(5); } // Fl_Button* o { Fl_Button* o = new Fl_Button(10, 36, 90, 25, "button"); - o->box(FL_UP_BOX); - o->color((Fl_Color)179); - o->selection_color(o->color()); - o->tooltip("selection_color() = color()"); - o->labelfont(4); - o->labelcolor(FL_BACKGROUND2_COLOR); + o->box(FL_UP_BOX); + o->color((Fl_Color)179); + o->selection_color(o->color()); + o->tooltip("selection_color() = color()"); + o->labelfont(4); + o->labelcolor(FL_BACKGROUND2_COLOR); } // Fl_Button* o { Fl_Button* o = new Fl_Button(10, 63, 90, 25, "button"); - o->box(FL_UP_BOX); - o->color((Fl_Color)91); - o->selection_color(fl_lighter(o->color())); - o->tooltip("selection_color() = fl_lighter(color())"); + o->box(FL_UP_BOX); + o->color((Fl_Color)91); + o->selection_color(fl_lighter(o->color())); + o->tooltip("selection_color() = fl_lighter(color())"); } // Fl_Button* o { Fl_Button* o = new Fl_Button(10, 90, 90, 25, "button"); - o->box(FL_UP_BOX); - o->color(FL_INACTIVE_COLOR); - o->selection_color(fl_darker(o->color())); - o->tooltip("selection_color() = fl_darker(color())"); - o->labelcolor(FL_BACKGROUND2_COLOR); + o->box(FL_UP_BOX); + o->color(FL_INACTIVE_COLOR); + o->selection_color(fl_darker(o->color())); + o->tooltip("selection_color() = fl_darker(color())"); + o->labelcolor(FL_BACKGROUND2_COLOR); } // Fl_Button* o { Fl_Tabs* o = new Fl_Tabs(10, 120, 320, 215); - o->color(FL_DARK1); - o->selection_color(FL_DARK1); - { Fl_Group* o = new Fl_Group(14, 141, 310, 190, "tab1"); - //o->box(FL_THIN_UP_BOX); - o->color(FL_DARK1); - o->selection_color((Fl_Color)23); - o->hide(); - { Fl_Clock* o = new Fl_Clock(24, 166, 130, 130); - o->box(FL_THIN_UP_BOX); - o->color((Fl_Color)12); - o->selection_color(FL_BACKGROUND2_COLOR); - o->labelcolor(FL_BACKGROUND2_COLOR); - o->tooltip("Fl_Clock with thin up box"); - } // Fl_Clock* o - { new Fl_Progress(22, 306, 290, 20); - } // Fl_Progress* o - { Fl_Clock* o = new Fl_Clock(179, 166, 130, 130); - o->box(FL_THIN_DOWN_BOX); - o->color((Fl_Color)26); - o->tooltip("Fl_Clock with thin down box"); - } // Fl_Clock* o - o->end(); - } // Fl_Group* o - { Fl_Group* o = new Fl_Group(15, 140, 310, 190, "tab2"); - //o->box(FL_THIN_UP_BOX); - o->color(FL_DARK1); - { Fl_Slider* o = new Fl_Slider(20, 161, 25, 155); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_Slider with down box"); - } // Fl_Slider* o - { Fl_Scrollbar* o = new Fl_Scrollbar(50, 161, 25, 155); + o->color(FL_DARK1); + o->selection_color(FL_DARK1); + { Fl_Group* o = new Fl_Group(14, 141, 310, 190, "tab1"); + //o->box(FL_THIN_UP_BOX); + o->color(FL_DARK1); + o->selection_color((Fl_Color)23); + o->hide(); + { Fl_Clock* o = new Fl_Clock(24, 166, 130, 130); + o->box(FL_THIN_UP_BOX); + o->color((Fl_Color)12); + o->selection_color(FL_BACKGROUND2_COLOR); + o->labelcolor(FL_BACKGROUND2_COLOR); + o->tooltip("Fl_Clock with thin up box"); + } // Fl_Clock* o + { new Fl_Progress(22, 306, 290, 20); + } // Fl_Progress* o + { Fl_Clock* o = new Fl_Clock(179, 166, 130, 130); + o->box(FL_THIN_DOWN_BOX); + o->color((Fl_Color)26); + o->tooltip("Fl_Clock with thin down box"); + } // Fl_Clock* o + o->end(); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(15, 140, 310, 190, "tab2"); + //o->box(FL_THIN_UP_BOX); + o->color(FL_DARK1); + { Fl_Slider* o = new Fl_Slider(20, 161, 25, 155); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_Slider with down box"); + } // Fl_Slider* o + { Fl_Scrollbar* o = new Fl_Scrollbar(50, 161, 25, 155); o->value(0, 50, 1, 100); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_Scrollbar with down box"); - } // Fl_Scrollbar* o - { Fl_Value_Slider* o = new Fl_Value_Slider(115, 161, 25, 155); - o->box(FL_DOWN_BOX); - } // Fl_Value_Slider* o - { Fl_Value_Output* o = new Fl_Value_Output(240, 265, 75, 25); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_Value_Output with down box"); - } // Fl_Value_Output* o - { Fl_Adjuster* o = new Fl_Adjuster(185, 210, 100, 25); - o->tooltip("Fl_Adjuster"); - } // Fl_Adjuster* o - { Fl_Counter* o = new Fl_Counter(185, 180, 100, 25); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_Counter with down box"); - } // Fl_Counter* o - { Fl_Roller* o = new Fl_Roller(85, 161, 25, 155); - o->box(FL_UP_BOX); - o->tooltip("Fl_Roller with up box"); - } // Fl_Roller* o - { Fl_Value_Input* o = new Fl_Value_Input(155, 265, 75, 25); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_Value_Input with down box"); - } // Fl_Value_Input* o - o->end(); - } // Fl_Group* o - { Fl_Group* o = new Fl_Group(15, 140, 310, 190, "tab3"); - //o->box(FL_THIN_UP_BOX); - o->color(FL_DARK1); - o->hide(); - { Fl_Input* o = new Fl_Input(40, 230, 120, 25); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_Input with down box"); - } // Fl_Input* o - { Fl_Output* o = new Fl_Output(40, 260, 120, 25); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_Output with down box"); - } // Fl_Output* o - { Fl_Text_Editor* o = new Fl_Text_Editor(180, 160, 125, 55); - o->box(FL_DOWN_FRAME); - o->color((Fl_Color)80); - o->tooltip("Fl_Text_Editor with down frame"); - o->textsize(8); - o->buffer(new Fl_Text_Buffer()); - o->buffer()->text("Text editor"); - } // Fl_Text_Editor* o - { Fl_Text_Display* o = new Fl_Text_Display(180, 230, 125, 55); - o->box(FL_DOWN_FRAME); - o->color((Fl_Color)12); - o->tooltip("Fl_Text_Display with down frame"); - o->textsize(8); - o->buffer(new Fl_Text_Buffer()); - o->buffer()->text("Text display"); - } // Fl_Text_Display* o - { Fl_File_Input* o = new Fl_File_Input(40, 290, 265, 30); - o->box(FL_DOWN_BOX); - o->tooltip("Fl_File_Input with down box"); - } // Fl_File_Input* o - o->end(); - } // Fl_Group* o - { Fl_Group* o = new Fl_Group(15, 140, 310, 190, "tab4"); - // o->box(FL_THIN_UP_BOX); - o->color(FL_DARK1); - o->hide(); - { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 160, 120, 25, "Choice 1"); - o->tooltip("Fl_Radio_Round_Button (default)"); - // don't set selection color (use default selection color) - o->value(1); // selected - } // Fl_Radio_Round_Button* o - { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 190, 120, 25, "Choice 2"); - o->tooltip("Fl_Radio_Round_Button (red)"); - o->selection_color(FL_RED); - } // Fl_Radio_Round_Button* o - { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 220, 120, 25, "Choice 3"); - o->tooltip("Fl_Radio_Round_Button (green)"); - o->selection_color(FL_GREEN); - } // Fl_Radio_Round_Button* o - { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 250, 120, 25, "Choice 4"); - o->tooltip("Fl_Radio_Round_Button (blue)"); - o->selection_color(FL_BLUE); - } // Fl_Radio_Round_Button* o - o->end(); - } // Fl_Group* o - o->end(); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_Scrollbar with down box"); + } // Fl_Scrollbar* o + { Fl_Value_Slider* o = new Fl_Value_Slider(115, 161, 25, 155); + o->box(FL_DOWN_BOX); + } // Fl_Value_Slider* o + { Fl_Value_Output* o = new Fl_Value_Output(240, 265, 75, 25); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_Value_Output with down box"); + } // Fl_Value_Output* o + { Fl_Adjuster* o = new Fl_Adjuster(185, 210, 100, 25); + o->tooltip("Fl_Adjuster"); + } // Fl_Adjuster* o + { Fl_Counter* o = new Fl_Counter(185, 180, 100, 25); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_Counter with down box"); + } // Fl_Counter* o + { Fl_Roller* o = new Fl_Roller(85, 161, 25, 155); + o->box(FL_UP_BOX); + o->tooltip("Fl_Roller with up box"); + } // Fl_Roller* o + { Fl_Value_Input* o = new Fl_Value_Input(155, 265, 75, 25); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_Value_Input with down box"); + } // Fl_Value_Input* o + o->end(); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(15, 140, 310, 190, "tab3"); + //o->box(FL_THIN_UP_BOX); + o->color(FL_DARK1); + o->hide(); + { Fl_Input* o = new Fl_Input(40, 230, 120, 25); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_Input with down box"); + } // Fl_Input* o + { Fl_Output* o = new Fl_Output(40, 260, 120, 25); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_Output with down box"); + } // Fl_Output* o + { Fl_Text_Editor* o = new Fl_Text_Editor(180, 160, 125, 55); + o->box(FL_DOWN_FRAME); + o->color((Fl_Color)80); + o->tooltip("Fl_Text_Editor with down frame"); + o->textsize(8); + o->buffer(new Fl_Text_Buffer()); + o->buffer()->text("Text editor"); + } // Fl_Text_Editor* o + { Fl_Text_Display* o = new Fl_Text_Display(180, 230, 125, 55); + o->box(FL_DOWN_FRAME); + o->color((Fl_Color)12); + o->tooltip("Fl_Text_Display with down frame"); + o->textsize(8); + o->buffer(new Fl_Text_Buffer()); + o->buffer()->text("Text display"); + } // Fl_Text_Display* o + { Fl_File_Input* o = new Fl_File_Input(40, 290, 265, 30); + o->box(FL_DOWN_BOX); + o->tooltip("Fl_File_Input with down box"); + } // Fl_File_Input* o + o->end(); + } // Fl_Group* o + { Fl_Group* o = new Fl_Group(15, 140, 310, 190, "tab4"); + // o->box(FL_THIN_UP_BOX); + o->color(FL_DARK1); + o->hide(); + { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 160, 120, 25, "Choice 1"); + o->tooltip("Fl_Radio_Round_Button (default)"); + // don't set selection color (use default selection color) + o->value(1); // selected + } // Fl_Radio_Round_Button* o + { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 190, 120, 25, "Choice 2"); + o->tooltip("Fl_Radio_Round_Button (red)"); + o->selection_color(FL_RED); + } // Fl_Radio_Round_Button* o + { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 220, 120, 25, "Choice 3"); + o->tooltip("Fl_Radio_Round_Button (green)"); + o->selection_color(FL_GREEN); + } // Fl_Radio_Round_Button* o + { Fl_Radio_Round_Button* o = new Fl_Radio_Round_Button(40, 250, 120, 25, "Choice 4"); + o->tooltip("Fl_Radio_Round_Button (blue)"); + o->selection_color(FL_BLUE); + } // Fl_Radio_Round_Button* o + o->end(); + } // Fl_Group* o + o->end(); } // Fl_Tabs* o { Fl_Box* o = new Fl_Box(341, 10, 80, 50, "thin box\ndown1"); - o->box(FL_THIN_DOWN_BOX); - o->color((Fl_Color)20); - o->labelsize(10); + o->box(FL_THIN_DOWN_BOX); + o->color((Fl_Color)20); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(430, 10, 80, 50, "thin box\nup1"); - o->box(FL_THIN_UP_BOX); - o->color(FL_SELECTION_COLOR); - o->labelcolor((Fl_Color)6); - o->labelsize(10); + o->box(FL_THIN_UP_BOX); + o->color(FL_SELECTION_COLOR); + o->labelcolor((Fl_Color)6); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(341, 71, 80, 44, "thin box\ndown2"); - o->box(FL_THIN_DOWN_BOX); - o->color((Fl_Color)190); - o->labelsize(10); + o->box(FL_THIN_DOWN_BOX); + o->color((Fl_Color)190); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(430, 71, 80, 44, "thin box\nup2"); - o->box(FL_THIN_UP_BOX); - o->color((Fl_Color)96); - o->labelcolor(FL_BACKGROUND2_COLOR); - o->labelsize(10); + o->box(FL_THIN_UP_BOX); + o->color((Fl_Color)96); + o->labelcolor(FL_BACKGROUND2_COLOR); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(341, 127, 80, 50, "box down3"); - o->box(FL_DOWN_BOX); - o->color((Fl_Color)3); - o->labelsize(10); + o->box(FL_DOWN_BOX); + o->color((Fl_Color)3); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(430, 127, 80, 50, "box up3"); - o->box(FL_UP_BOX); - o->color((Fl_Color)104); - o->labelcolor((Fl_Color)3); - o->labelsize(10); + o->box(FL_UP_BOX); + o->color((Fl_Color)104); + o->labelcolor((Fl_Color)3); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(341, 189, 80, 50, "box down4"); - o->box(FL_DOWN_BOX); - o->color((Fl_Color)42); - o->labelcolor(FL_DARK_RED); - o->labelsize(10); + o->box(FL_DOWN_BOX); + o->color((Fl_Color)42); + o->labelcolor(FL_DARK_RED); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(430, 189, 80, 50, "box up4"); - o->box(FL_UP_BOX); - o->color((Fl_Color)30); - o->labelcolor((Fl_Color)26); - o->labelsize(10); + o->box(FL_UP_BOX); + o->color((Fl_Color)30); + o->labelcolor((Fl_Color)26); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(341, 251, 80, 82, "box down5"); - o->box(FL_DOWN_BOX); - o->color((Fl_Color)19); - o->labelcolor((Fl_Color)4); - o->labelsize(10); + o->box(FL_DOWN_BOX); + o->color((Fl_Color)19); + o->labelcolor((Fl_Color)4); + o->labelsize(10); } // Fl_Box* o { Fl_Box* o = new Fl_Box(430, 251, 80, 82, "box up5"); - o->box(FL_UP_BOX); - o->color(FL_FOREGROUND_COLOR); - o->labelcolor(FL_BACKGROUND2_COLOR); - o->labelsize(10); + o->box(FL_UP_BOX); + o->color(FL_FOREGROUND_COLOR); + o->labelcolor(FL_BACKGROUND2_COLOR); + o->labelsize(10); } // Fl_Box* o { Fl_Light_Button* o = new Fl_Light_Button(110, 10, 105, 25, "Light"); - o->box(FL_DOWN_BOX); - o->color(FL_BACKGROUND2_COLOR); - o->selection_color((Fl_Color)30); - o->selection_color((Fl_Color)FL_RED); - o->tooltip("Fl_Light_Button with down box"); + o->box(FL_DOWN_BOX); + o->color(FL_BACKGROUND2_COLOR); + o->selection_color((Fl_Color)30); + o->selection_color((Fl_Color)FL_RED); + o->tooltip("Fl_Light_Button with down box"); } // Fl_Light_Button* o { Fl_Check_Button* o = new Fl_Check_Button(110, 37, 105, 25, "Check"); - o->box(FL_DOWN_FRAME); - o->down_box(FL_DOWN_BOX); - o->color(FL_DARK1); - o->selection_color((Fl_Color)FL_GREEN); - o->tooltip("Fl_Check_Button with down frame"); + o->box(FL_DOWN_FRAME); + o->down_box(FL_DOWN_BOX); + o->color(FL_DARK1); + o->selection_color((Fl_Color)FL_GREEN); + o->tooltip("Fl_Check_Button with down frame"); } // Fl_Check_Button* o { Fl_Input* o = new Fl_Input(220, 10, 100, 25); - o->box(FL_DOWN_BOX); - o->color((Fl_Color)23); - o->tooltip("Fl_Input with down box"); + o->box(FL_DOWN_BOX); + o->color((Fl_Color)23); + o->tooltip("Fl_Input with down box"); } // Fl_Input* o { Fl_Adjuster* o = new Fl_Adjuster(110, 65, 80, 43); - o->box(FL_UP_BOX); - o->color(FL_INACTIVE_COLOR); - o->selection_color(FL_BACKGROUND2_COLOR); - o->labelcolor((Fl_Color)55); - o->tooltip("Fl_Adjuster with up box"); + o->box(FL_UP_BOX); + o->color(FL_INACTIVE_COLOR); + o->selection_color(FL_BACKGROUND2_COLOR); + o->labelcolor((Fl_Color)55); + o->tooltip("Fl_Adjuster with up box"); } // Fl_Adjuster* o { Fl_Text_Editor* o = new Fl_Text_Editor(220, 53, 100, 29, "down frame"); - o->box(FL_DOWN_FRAME); - o->color((Fl_Color)19); - o->selection_color(FL_DARK1); - o->tooltip("Fl_Adjuster with down frame"); + o->box(FL_DOWN_FRAME); + o->color((Fl_Color)19); + o->selection_color(FL_DARK1); + o->tooltip("Fl_Adjuster with down frame"); } // Fl_Text_Editor* o { Fl_Text_Editor* o = new Fl_Text_Editor(220, 99, 100, 38, "up frame"); - o->box(FL_UP_FRAME); - o->color((Fl_Color)19); - o->selection_color(FL_DARK1); - o->tooltip("Fl_Text_Editor with up frame"); + o->box(FL_UP_FRAME); + o->color((Fl_Color)19); + o->selection_color(FL_DARK1); + o->tooltip("Fl_Text_Editor with up frame"); } // Fl_Text_Editor* o } subwin->end(); @@ -327,7 +325,3 @@ public: }; UnitTest schemestest("schemes test", SchemesTest::create); - -// -// End of "$Id$ -// -- cgit v1.2.3