From b1ba37c5ba1df543baa87d328805af34da4bd2b1 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 24 Nov 2022 19:00:00 +0100 Subject: Add "Oxy" scheme (STR 2675, STR 3477) This commit is similar to the patch given in STR 3477, oxy_v5.diff: https://www.fltk.org/strfiles/3477/oxy_v5.diff ... with modifications, and updated to current FLTK code. --- test/demo.cxx | 10 ++++++---- test/unittest_schemes.cxx | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/demo.cxx b/test/demo.cxx index e23907ba6..c41b22d45 100644 --- a/test/demo.cxx +++ b/test/demo.cxx @@ -190,13 +190,15 @@ void create_the_forms() { choice->add("none"); choice->add("gtk+"); choice->add("gleam"); + choice->add("oxy"); choice->add("plastic"); choice->callback((Fl_Callback *)doscheme); Fl::scheme(NULL); - if (!Fl::scheme()) choice->value(0); - else if (!strcmp(Fl::scheme(), "gtk+")) choice->value(1); - else if (!strcmp(Fl::scheme(), "gleam")) choice->value(2); - else if (!strcmp(Fl::scheme(), "plastic")) choice->value(3); + if (!Fl::scheme()) choice->value(0); + else if (!strcmp(Fl::scheme(), "gtk+")) choice->value(1); + else if (!strcmp(Fl::scheme(), "gleam")) choice->value(2); + else if (!strcmp(Fl::scheme(), "oxy")) choice->value(3); + else if (!strcmp(Fl::scheme(), "plastic")) choice->value(4); else choice->value(0); exit_button = new Fl_Button(280, 405, 60, 25, "Exit"); diff --git a/test/unittest_schemes.cxx b/test/unittest_schemes.cxx index a5ca29399..d37362b5e 100644 --- a/test/unittest_schemes.cxx +++ b/test/unittest_schemes.cxx @@ -86,6 +86,7 @@ public: schemechoice->add("plastic"); schemechoice->add("gtk+"); schemechoice->add("gleam"); + schemechoice->add("oxy"); schemechoice->value(0); schemechoice->labelfont(FL_HELVETICA_BOLD); const char *name = Fl::scheme(); @@ -93,6 +94,7 @@ public: if ( strcmp(name, "plastic") == 0) { schemechoice->value(1); } else if ( strcmp(name, "gtk+") == 0) { schemechoice->value(2); } else if ( strcmp(name, "gleam") == 0) { schemechoice->value(3); } + else if ( strcmp(name, "oxy") == 0) { schemechoice->value(4); } } schemechoice->callback(SchemeChoice_CB, (void*)this); -- cgit v1.2.3