diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-03-19 14:44:16 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2025-03-19 14:44:16 +0100 |
| commit | 1ccafa83b2c783fdfe088af1ddf9a853e071cf5d (patch) | |
| tree | 7b4c292888807b02448ff5341208821e5c2a2eed /FL/fl_ask.H | |
| parent | 4b07ab391ac77e2996e61646a258064bb1cadfeb (diff) | |
Remove obsolete build option 'FLTK_OPTION_STD'
This option is no longer needed since FLTK 1.5 always requires C++11.
Diffstat (limited to 'FL/fl_ask.H')
| -rw-r--r-- | FL/fl_ask.H | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/FL/fl_ask.H b/FL/fl_ask.H index 2387a1947..830dec97c 100644 --- a/FL/fl_ask.H +++ b/FL/fl_ask.H @@ -1,7 +1,7 @@ // // Standard dialog header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2022 by Bill Spitzak and others. +// Copyright 1998-2025 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 @@ -24,9 +24,7 @@ #include <FL/Enumerations.H> #include <FL/fl_attr.h> -#if (FLTK_USE_STD) #include <string> -#endif class Fl_Widget; @@ -76,13 +74,12 @@ FL_EXPORT const char *fl_input(int maxchar, const char *label, const char *deflt FL_EXPORT const char *fl_password(int maxchar, const char *label, const char *deflt = 0, ...) __fl_attr((__format__(__printf__, 2, 4))); -// since FLTK 1.4.0 -- only with option FLTK_USE_STD +// since FLTK 1.4.0 -- optional +// since FLTK 1.5.0 -- always // - fl_input_str() with limited input size, returns std::string // - fl_password_str() with limited input size, returns std::string -#if (FLTK_USE_STD) - FL_EXPORT std::string fl_input_str(int maxchar, const char *label, const char *deflt = 0, ...) __fl_attr((__format__(__printf__, 2, 4))); @@ -95,8 +92,6 @@ FL_EXPORT std::string fl_password_str(int maxchar, const char *label, const char FL_EXPORT std::string fl_password_str(int &ret, int maxchar, const char *label, const char *deflt = 0, ...) __fl_attr((__format__(__printf__, 3, 5))); -#endif - FL_EXPORT Fl_Widget *fl_message_icon(); extern FL_EXPORT Fl_Font fl_message_font_; extern FL_EXPORT Fl_Fontsize fl_message_size_; |