1 files changed, 24 insertions, 8 deletions
diff --git a/FL/fl_ask.H b/FL/fl_ask.H
index c4eb3ab86..2387a1947 100644
--- a/FL/fl_ask.H
+++ b/FL/fl_ask.H
@@ -22,9 +22,12 @@
 #define _FL_fl_ask_H_
 
 #include <FL/Enumerations.H>
-#include <FL/Fl_String.H>
 #include <FL/fl_attr.h>
 
+#if (FLTK_USE_STD)
+#include <string>
+#endif
+
 class Fl_Widget;
 
 /** Defines the different system beeps available.
@@ -65,22 +68,35 @@ FL_EXPORT const char *fl_password(const char *label, const char *deflt = 0, ...)
 FL_EXPORT int fl_choice_n(const char *q, const char *b0, const char *b1, const char *b2, ...)
     __fl_attr((__format__(__printf__, 1, 5)));
 
-// since FLTK 1.4.0:
-// - fl_input_str()    with limited input size
-// - fl_password_str() with limited input size (*_str)
+// since FLTK 1.4.0: with 'maxchar' to limit input size
+
+FL_EXPORT const char *fl_input(int maxchar, const char *label, const char *deflt = 0, ...)
+    __fl_attr((__format__(__printf__, 2, 4)));
 
-FL_EXPORT Fl_String fl_input_str(int maxchar, const char *label, const char *deflt = 0, ...)
+FL_EXPORT const char *fl_password(int maxchar, const char *label, const char *deflt = 0, ...)
     __fl_attr((__format__(__printf__, 2, 4)));
 
-FL_EXPORT Fl_String fl_input_str(int &ret, int maxchar, const char *label, const char *deflt = 0, ...)
+// since FLTK 1.4.0 -- only with option FLTK_USE_STD
+
+// - 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)));
+
+FL_EXPORT std::string fl_input_str(int &ret, int maxchar, const char *label, const char *deflt = 0, ...)
     __fl_attr((__format__(__printf__, 3, 5)));
 
-FL_EXPORT Fl_String fl_password_str(int maxchar, const char *label, const char *deflt = 0, ...)
+FL_EXPORT std::string fl_password_str(int maxchar, const char *label, const char *deflt = 0, ...)
     __fl_attr((__format__(__printf__, 2, 4)));
 
-FL_EXPORT Fl_String fl_password_str(int &ret, int maxchar, const char *label, const char *deflt = 0, ...)
+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_;