From 7ef23153df6ab66a15a69c052df0ccd82bc6d352 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 13 Jan 2021 15:12:26 +0100 Subject: [PATCH] Update test/hello.cxx and related image Improve CMP compatibility and use a better (anti-aliased) image for the docs. --- documentation/src/basics.dox | 12 ++++++------ documentation/src/hello_cxx.png | Bin 1195 -> 2383 bytes test/hello.cxx | 9 ++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/documentation/src/basics.dox b/documentation/src/basics.dox index 2b839c322..71edef38c 100644 --- a/documentation/src/basics.dox +++ b/documentation/src/basics.dox @@ -19,10 +19,10 @@ World!" program that uses FLTK to display the window. #include int main(int argc, char **argv) { - Fl_Window *window = new Fl_Window(340,180); - Fl_Box *box = new Fl_Box(20,40,300,100,"Hello, World!"); + Fl_Window *window = new Fl_Window(340, 180); + Fl_Box *box = new Fl_Box(20, 40, 300, 100, "Hello, World!"); box->box(FL_UP_BOX); - box->labelfont(FL_BOLD+FL_ITALIC); + box->labelfont(FL_BOLD + FL_ITALIC); box->labelsize(36); box->labeltype(FL_SHADOW_LABEL); window->end(); @@ -37,21 +37,21 @@ After including the required header files, the program then creates a window. All following widgets will automatically be children of this window. \code -Fl_Window *window = new Fl_Window(340,180); +Fl_Window *window = new Fl_Window(340, 180); \endcode Then we create a box with the "Hello, World!" string in it. FLTK automatically adds the new box to \p window, the current grouping widget. \code -Fl_Box *box = new Fl_Box(20,40,300,100,"Hello, World!"); +Fl_Box *box = new Fl_Box(20, 40, 300, 100, "Hello, World!"); \endcode Next, we set the type of box and the font, size, and style of the label: \code box->box(FL_UP_BOX); -box->labelfont(FL_BOLD+FL_ITALIC); +box->labelfont(FL_BOLD + FL_ITALIC); box->labelsize(36); box->labeltype(FL_SHADOW_LABEL); \endcode diff --git a/documentation/src/hello_cxx.png b/documentation/src/hello_cxx.png index 43604e3e61651052f1ca218823e8b1a3b7b2b19a..de86966dfd39d93bb1d25c04173f99e94c273861 100644 GIT binary patch literal 2383 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 diff --git a/test/hello.cxx b/test/hello.cxx index b301832b7..d7308cd78 100644 --- a/test/hello.cxx +++ b/test/hello.cxx @@ -1,7 +1,7 @@ // // Hello, World! program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2021 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 @@ -19,14 +19,13 @@ #include int main(int argc, char **argv) { - Fl_Window *window = new Fl_Window(340,180); - Fl_Box *box = new Fl_Box(20,40,300,100,"Hello, World!"); + Fl_Window *window = new Fl_Window(340, 180); + Fl_Box *box = new Fl_Box(20, 40, 300, 100, "Hello, World!"); box->box(FL_UP_BOX); - box->labelfont(FL_BOLD+FL_ITALIC); + box->labelfont(FL_BOLD + FL_ITALIC); box->labelsize(36); box->labeltype(FL_SHADOW_LABEL); window->end(); window->show(argc, argv); return Fl::run(); } -