From 1209e9dcd7e1e97bedc747d06ba4eea837562158 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 22 Oct 2023 19:30:37 +0200 Subject: 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 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) --- CMake/options.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'CMake') diff --git a/CMake/options.cmake b/CMake/options.cmake index 17fcda3f2..9f3079595 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -311,6 +311,16 @@ if (APPLE) endif (CMAKE_OSX_SYSROOT) endif (APPLE) +####################################################################### +option (OPTION_USE_STD "allow FLTK to use some std:: features" OFF) +if (OPTION_USE_STD) + set (FLTK_USE_STD 1) +else () + set (FLTK_USE_STD 0) +endif () + +####################################################################### + # find X11 libraries and headers set (PATH_TO_XLIBS) if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32 AND NOT OPTION_USE_WAYLAND) -- cgit v1.2.3