diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-10-22 19:30:37 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-10-22 19:35:17 +0200 |
| commit | 1209e9dcd7e1e97bedc747d06ba4eea837562158 (patch) | |
| tree | 7897d3c61368958f191bfe684b96d1d08467a2bb /fl_config.cmake.in | |
| parent | 05ac0247cbd902f910fa89f8d4f4fde9de904b0f (diff) | |
Make Fl_String and Fl_Int_Vector private (#789)
- add CMake option 'OPTION_USE_STD'
- add configure option '--enable-use_std'
- move FL/Fl_String.H to src/Fl_String.H
- move FL/Fl_Int_Vector.H to src/Fl_Int_Vector.H
- remove Fl_String from demo program examples/callbacks.cxx
- remove Fl_Int_Vector from public header FL/Fl_Table.H
- some methods of Fl_Table are no longer inline
- add CMake option OPTION_USE_STD to allow std::string in some
selected functions and methods
Experimental, may be removed before release:
- use either Fl_Int_Vector or std::vector in Fl_Table depending
on CMake OPTION_USE_STD or configure --enable-use_std
Move all fl_filename* functions that use Fl_String to fluid
Main changes in fluid:
- add fluid_filename.h and .cxx
- include "fluid_filename.h" rather than <FL/filename.H>
Update fl_input(), fl_password() and test/ask
- add maxchar parameter to fl_input() and fl_password()
- fl_input_str() and fl_password_str() are optional and return
std::string if enabled (FLTK_USE_STD)
Diffstat (limited to 'fl_config.cmake.in')
| -rw-r--r-- | fl_config.cmake.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/fl_config.cmake.in b/fl_config.cmake.in index 0acc7a8ff..a6e3b086e 100644 --- a/fl_config.cmake.in +++ b/fl_config.cmake.in @@ -19,7 +19,7 @@ #define _FL_fl_config_h_ /* - * FL_ABI_VERSION (ABI version): + * FL_ABI_VERSION (ABI version) * * define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero) */ @@ -75,4 +75,17 @@ #cmakedefine FLTK_USE_WAYLAND 1 + +/* + * FLTK_USE_STD + * + * May we use std::string and std::vector for the current build? + * + * This is a build configuration option which allows FLTK to add some + * features based on std::string and std::vector in FLTK 1.4.x + * + */ + +#cmakedefine01 FLTK_USE_STD + #endif /* _FL_fl_config_h_ */ |