diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-09 18:04:31 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-09 18:04:31 +0000 |
| commit | 965be94165f1b8e4b92d7d34a8f8bcc5cd146c3b (patch) | |
| tree | 19b89c081ffb62ba204d56f1a8172d8e74cac494 | |
| parent | 522fc17d31171650b53d9c676bdc67dd1a4b70ee (diff) | |
Make demo programs display the correct Fl::scheme() in all cases.
Demo programs using Fl::args() and fl_get_system_colors() instead of
Fl_Window::show(argc,argv) didn't correctly initialize the Fl::scheme()
if the environment variable FLTK_SCHEME was set.
Calling Fl::scheme(Fl::scheme()) fixes this, because (currently) only
Fl::scheme(NULL) reads the environment variable FLTK_SCHEME.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10565 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | test/boxtype.cxx | 1 | ||||
| -rw-r--r-- | test/twowin.cxx | 6 | ||||
| -rw-r--r-- | test/unittests.cxx | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/boxtype.cxx b/test/boxtype.cxx index 26a7f61e0..806be0220 100644 --- a/test/boxtype.cxx +++ b/test/boxtype.cxx @@ -104,6 +104,7 @@ int main(int argc, char ** argv) { #endif // set window title to show active scheme + Fl::scheme(Fl::scheme()); // init scheme char title[100]; sprintf(title,"FLTK boxtypes: scheme = '%s'",Fl::scheme()?Fl::scheme():"none"); window->label(title); diff --git a/test/twowin.cxx b/test/twowin.cxx index fb97cc124..3cad87663 100644 --- a/test/twowin.cxx +++ b/test/twowin.cxx @@ -3,7 +3,7 @@ // // Cross-window focus test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2014 by Bill Spitzak and others. +// Copyright 1998-2015 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -31,7 +31,7 @@ static void cb2(Fl_Widget *, void *) { b1->take_focus(); } -int main() { +int main(int argc, char **argv) { Fl_Double_Window *win1 = new Fl_Double_Window(200, 200); Fl_Button *bb1 = new Fl_Button(10, 10, 100, 100, "b1"); @@ -50,7 +50,7 @@ int main() { win1->position(200, 200); win2->position(400, 200); - win1->show(); + win1->show(argc,argv); win2->show(); return Fl::run(); } diff --git a/test/unittests.cxx b/test/unittests.cxx index d07cd8edf..a5c614918 100644 --- a/test/unittests.cxx +++ b/test/unittests.cxx @@ -171,6 +171,8 @@ void Browser_CB(Fl_Widget*, void*) { // registered tests to the browser widget. int main(int argc, char **argv) { Fl::args(argc,argv); + Fl::get_system_colors(); + Fl::scheme(Fl::scheme()); // init scheme before instantiating tests Fl::visual(FL_RGB); mainwin = new MainWindow(MAINWIN_W, MAINWIN_H, "Fltk Unit Tests"); browser = new Fl_Hold_Browser(BROWSER_X, BROWSER_Y, BROWSER_W, BROWSER_H, "Unit Tests"); |