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 /src/Fl_Message.h | |
| 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 'src/Fl_Message.h')
| -rw-r--r-- | src/Fl_Message.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Fl_Message.h b/src/Fl_Message.h index 2f33df1d1..4b0581a8c 100644 --- a/src/Fl_Message.h +++ b/src/Fl_Message.h @@ -88,10 +88,6 @@ private: // and fl_password() return their input text, we *need* to store // the text in an internal (static) buffer. :-( - // The newer functions fl_input_str() and fl_password_str() return the - // text in an Fl_String object that must be allocated and free()'d by - // the caller. - static char *input_buffer_; // points to the allocated text buffer static int input_size_; // size of allocated text buffer @@ -169,7 +165,7 @@ public: int innards(const char *fmt, va_list ap, const char *b0, const char *b1, const char *b2); - const char *input_innards(const char *fmt, va_list ap, const char *defstr, uchar type, int maxchar = -1); + const char *input_innards(const char *fmt, va_list ap, const char *defstr, uchar type, int maxchar = -1, bool str = false); }; /** |
