diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-07-08 13:54:44 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-07-08 13:59:47 +0200 |
| commit | 5cca79489b6400168eab8ea7eb3a05b2c6578752 (patch) | |
| tree | 5bace9831213bdff6559b54f5ff96dd43a04ae6b | |
| parent | 135ba3a7e1e40df3df1949eee800eaf8c8b67416 (diff) | |
Harmonize and document syntax of config.h source files
- configh.in: add and improve comments, reorder statements
- configh.cmake.in: add comments, fix whitespace
- src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx:
fix trailing whitespace
| -rw-r--r-- | configh.cmake.in | 16 | ||||
| -rw-r--r-- | configh.in | 27 | ||||
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx | 6 |
3 files changed, 40 insertions, 9 deletions
diff --git a/configh.cmake.in b/configh.cmake.in index 166687416..9195c2bc9 100644 --- a/configh.cmake.in +++ b/configh.cmake.in @@ -2,7 +2,7 @@ /* * Configuration file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2016 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 @@ -16,6 +16,18 @@ */ /* + * Note: configure syntax vs. CMake syntax in source files (examples): + * + * configh.in configh.cmake.in + * --------------------- ---------------------------- + * #define HAVE_GL 0 #cmakedefine01 HAVE_GL + * #undef HAVE_SNPRINTF #cmakedefine HAVE_SNPRINTF 1 + * + * The former #define's the given macro either as 0 or 1, + * the latter either does not define the macro or #define's it as 1. + */ + +/* * Where to find files... */ @@ -368,7 +380,7 @@ /* * Do we use GDI+ to get antialiased graphics? */ - + #ifdef _WIN32 #cmakedefine01 USE_GDIPLUS #endif diff --git a/configh.in b/configh.in index 3ef98ebae..f43d24142 100644 --- a/configh.in +++ b/configh.in @@ -1,7 +1,7 @@ /* * Configuration file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2016 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 @@ -15,6 +15,18 @@ */ /* + * Note: configure syntax vs. CMake syntax in source files (examples): + * + * configh.in configh.cmake.in + * --------------------- ---------------------------- + * #define HAVE_GL 0 #cmakedefine01 HAVE_GL + * #undef HAVE_SNPRINTF #cmakedefine HAVE_SNPRINTF 1 + * + * The former #define's the given macro either as 0 or 1, + * the latter either does not define the macro or #define's it as 1. + */ + +/* * Where to find files... */ @@ -168,7 +180,7 @@ * USE_SDL * * Should we use SDL for the current platform - * *FIXME* Not yet implemented in configure ! + * *FIXME* USE_SDL not yet implemented in configure ! * */ @@ -285,7 +297,6 @@ #undef HAVE_LIBPNG #undef HAVE_LIBZ #undef HAVE_LIBJPEG -#undef FLTK_USE_SVG /* * FLTK_USE_CAIRO @@ -319,6 +330,14 @@ #undef HAVE_PNG_SET_TRNS_TO_ALPHA /* +* FLTK_USE_SVG +* +* Do we want FLTK to read and write SVG-formatted files ? +*/ + +#undef FLTK_USE_SVG + +/* * Do we have POSIX threading? */ @@ -368,7 +387,7 @@ /* * Do we want filename handling and a filechooser? - * *FIXME* Not yet implemented in configure ! + * *FIXME* FL_CFG_NO_FILESYSTEM_SUPPORT not yet implemented in configure ! */ #undef FL_CFG_NO_FILESYSTEM_SUPPORT diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx index 20418333b..8e56a7cc1 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx @@ -77,7 +77,7 @@ void Fl_GDIplus_Graphics_Driver::line_style(int style, int width, char* dashes) pen_->SetDashStyle(Gdiplus::DashStyleDashDotDot); else if(!dashes || !*dashes) pen_->SetDashStyle(Gdiplus::DashStyleSolid); - + if (style & FL_CAP_ROUND ) { pen_->SetStartCap(Gdiplus::LineCapRound); pen_->SetEndCap(Gdiplus::LineCapRound); @@ -88,7 +88,7 @@ void Fl_GDIplus_Graphics_Driver::line_style(int style, int width, char* dashes) pen_->SetStartCap(Gdiplus::LineCapFlat); pen_->SetEndCap(Gdiplus::LineCapFlat); } - + if (style & FL_JOIN_MITER ) { pen_->SetLineJoin(Gdiplus::LineJoinMiter); } else if (style & FL_JOIN_BEVEL ) { @@ -96,7 +96,7 @@ void Fl_GDIplus_Graphics_Driver::line_style(int style, int width, char* dashes) } else { pen_->SetLineJoin(Gdiplus::LineJoinRound); } - + if (dashes && *dashes) { int n = 0; while (dashes[n]) n++; Gdiplus::REAL *gdi_dashes = new Gdiplus::REAL[n]; |
