Remove obsolete build option 'FLTK_OPTION_STD'

This option is no longer needed since FLTK 1.5 always requires C++11.
This commit is contained in:
Albrecht Schlosser
2025-03-19 14:44:16 +01:00
parent 4b07ab391a
commit 1ccafa83b2
11 changed files with 25 additions and 151 deletions
+2 -12
View File
@@ -22,17 +22,7 @@
#include <FL/Fl_Group.H>
#include <FL/Fl_Scroll.H>
// EXPERIMENTAL
// We use either std::vector or the private class Fl_Int_Vector
// depending on the build option FLTK_OPTION_STD or --enable-use_std.
// This option allows to use std::string and std::vector in FLTK 1.4.x
#if (FLTK_USE_STD)
#include <vector>
typedef std::vector<int> Fl_Int_Vector;
#else
class Fl_Int_Vector; // private class declared in src/Fl_Int_Vector.H
#endif
/**
A table of widgets or other content.
@@ -167,8 +157,8 @@ private:
};
unsigned int flags_;
Fl_Int_Vector *_colwidths; // column widths in pixels
Fl_Int_Vector *_rowheights; // row heights in pixels
std::vector<int> *_colwidths; // column widths in pixels
std::vector<int> *_rowheights; // row heights in pixels
// number of columns and rows == size of corresponding vectors
int col_size(); // size of the column widths vector
+3 -8
View File
@@ -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_;