mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Albrecht Schlosser 2015-02-09 18:04:31 +00:00
parent 522fc17d31
commit 965be94165
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/boxtype.cxx
View File

@ -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);

6
test/twowin.cxx
View File

@ -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();
}

2
test/unittests.cxx
View File

@ -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");