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)

1 files changed, 68 insertions, 28 deletions

diff --git a/fluid/makedepend b/fluid/makedepend
index eb8f7614a..01f72ae12 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -77,7 +77,6 @@ alignment_panel.o: ../FL/Fl_Shortcut_Button.H
 alignment_panel.o: ../FL/Fl_Simple_Terminal.H
 alignment_panel.o: ../FL/Fl_Slider.H
 alignment_panel.o: ../FL/Fl_Spinner.H
-alignment_panel.o: ../FL/Fl_String.H
 alignment_panel.o: ../FL/fl_string_functions.h
 alignment_panel.o: ../FL/Fl_Tabs.H
 alignment_panel.o: ../FL/Fl_Text_Buffer.H
@@ -94,10 +93,12 @@ alignment_panel.o: ../FL/Fl_Window.H
 alignment_panel.o: ../FL/Fl_Wizard.H
 alignment_panel.o: ../FL/platform_types.h
 alignment_panel.o: ../src/flstring.h
+alignment_panel.o: ../src/Fl_String.H
 alignment_panel.o: alignment_panel.h
 alignment_panel.o: code.h
 alignment_panel.o: Fd_Snap_Action.h
 alignment_panel.o: fluid.h
+alignment_panel.o: fluid_filename.h
 alignment_panel.o: Fl_Group_Type.h
 alignment_panel.o: Fl_Type.h
 alignment_panel.o: Fl_Widget_Type.h
@@ -127,7 +128,6 @@ align_widget.o: ../FL/Fl_Plugin.H
 align_widget.o: ../FL/Fl_Preferences.H
 align_widget.o: ../FL/Fl_Rect.H
 align_widget.o: ../FL/Fl_RGB_Image.H
-align_widget.o: ../FL/Fl_String.H
 align_widget.o: ../FL/Fl_Tabs.H
 align_widget.o: ../FL/fl_types.h
 align_widget.o: ../FL/fl_utf8.h
@@ -135,9 +135,11 @@ align_widget.o: ../FL/Fl_Widget.H
 align_widget.o: ../FL/Fl_Window.H
 align_widget.o: ../FL/Fl_Wizard.H
 align_widget.o: ../FL/platform_types.h
+align_widget.o: ../src/Fl_String.H
 align_widget.o: align_widget.h
 align_widget.o: code.h
 align_widget.o: fluid.h
+align_widget.o: fluid_filename.h
 align_widget.o: Fl_Group_Type.h
 align_widget.o: Fl_Type.h
 align_widget.o: Fl_Widget_Type.h
@@ -195,7 +197,6 @@ code.o: ../FL/Fl_Shortcut_Button.H
 code.o: ../FL/Fl_Simple_Terminal.H
 code.o: ../FL/Fl_Slider.H
 code.o: ../FL/Fl_Spinner.H
-code.o: ../FL/Fl_String.H
 code.o: ../FL/fl_string_functions.h
 code.o: ../FL/Fl_Tabs.H
 code.o: ../FL/Fl_Text_Buffer.H
@@ -211,12 +212,14 @@ code.o: ../FL/Fl_Window.H
 code.o: ../FL/Fl_Wizard.H
 code.o: ../FL/platform_types.h
 code.o: ../src/flstring.h
+code.o: ../src/Fl_String.H
 code.o: alignment_panel.h
 code.o: code.h
 code.o: ExternalCodeEditor_UNIX.h
 code.o: Fd_Snap_Action.h
 code.o: file.h
 code.o: fluid.h
+code.o: fluid_filename.h
 code.o: Fluid_Image.h
 code.o: Fl_Function_Type.h
 code.o: Fl_Group_Type.h
@@ -294,7 +297,6 @@ custom_widgets.o: ../FL/Fl_RGB_Image.H
 custom_widgets.o: ../FL/Fl_Scrollbar.H
 custom_widgets.o: ../FL/Fl_Shortcut_Button.H
 custom_widgets.o: ../FL/Fl_Slider.H
-custom_widgets.o: ../FL/Fl_String.H
 custom_widgets.o: ../FL/fl_string_functions.h
 custom_widgets.o: ../FL/Fl_Tabs.H
 custom_widgets.o: ../FL/Fl_Text_Buffer.H
@@ -312,11 +314,13 @@ custom_widgets.o: ../FL/platform.H
 custom_widgets.o: ../FL/platform_types.h
 custom_widgets.o: ../FL/x11.H
 custom_widgets.o: ../src/flstring.h
+custom_widgets.o: ../src/Fl_String.H
 custom_widgets.o: code.h
 custom_widgets.o: CodeEditor.h
 custom_widgets.o: custom_widgets.h
 custom_widgets.o: factory.h
 custom_widgets.o: fluid.h
+custom_widgets.o: fluid_filename.h
 custom_widgets.o: Fl_Group_Type.h
 custom_widgets.o: Fl_Type.h
 custom_widgets.o: Fl_Widget_Type.h
@@ -337,14 +341,15 @@ ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Image.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Menu_Item.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Preferences.H
-ExternalCodeEditor_UNIX.o: ../FL/Fl_String.H
 ExternalCodeEditor_UNIX.o: ../FL/fl_string_functions.h
 ExternalCodeEditor_UNIX.o: ../FL/fl_types.h
 ExternalCodeEditor_UNIX.o: ../FL/fl_utf8.h
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Widget.H
 ExternalCodeEditor_UNIX.o: ../FL/platform_types.h
+ExternalCodeEditor_UNIX.o: ../src/Fl_String.H
 ExternalCodeEditor_UNIX.o: ExternalCodeEditor_UNIX.h
 ExternalCodeEditor_UNIX.o: fluid.h
+ExternalCodeEditor_UNIX.o: fluid_filename.h
 factory.o: ../config.h
 factory.o: ../FL/Enumerations.H
 factory.o: ../FL/filename.H
@@ -397,7 +402,6 @@ factory.o: ../FL/Fl_Scrollbar.H
 factory.o: ../FL/Fl_Simple_Terminal.H
 factory.o: ../FL/Fl_Slider.H
 factory.o: ../FL/Fl_Spinner.H
-factory.o: ../FL/Fl_String.H
 factory.o: ../FL/Fl_Tabs.H
 factory.o: ../FL/Fl_Text_Buffer.H
 factory.o: ../FL/Fl_Text_Display.H
@@ -417,10 +421,12 @@ factory.o: ../FL/Fl_Window.H
 factory.o: ../FL/Fl_Wizard.H
 factory.o: ../FL/platform_types.h
 factory.o: ../src/flstring.h
+factory.o: ../src/Fl_String.H
 factory.o: code.h
 factory.o: factory.h
 factory.o: Fd_Snap_Action.h
 factory.o: fluid.h
+factory.o: fluid_filename.h
 factory.o: Fl_Button_Type.h
 factory.o: Fl_Group_Type.h
 factory.o: Fl_Menu_Type.h
@@ -480,7 +486,6 @@ Fd_Snap_Action.o: ../FL/Fl_Shortcut_Button.H
 Fd_Snap_Action.o: ../FL/Fl_Simple_Terminal.H
 Fd_Snap_Action.o: ../FL/Fl_Slider.H
 Fd_Snap_Action.o: ../FL/Fl_Spinner.H
-Fd_Snap_Action.o: ../FL/Fl_String.H
 Fd_Snap_Action.o: ../FL/fl_string_functions.h
 Fd_Snap_Action.o: ../FL/Fl_Tabs.H
 Fd_Snap_Action.o: ../FL/Fl_Text_Buffer.H
@@ -495,11 +500,13 @@ Fd_Snap_Action.o: ../FL/Fl_Widget.H
 Fd_Snap_Action.o: ../FL/Fl_Window.H
 Fd_Snap_Action.o: ../FL/Fl_Wizard.H
 Fd_Snap_Action.o: ../FL/platform_types.h
+Fd_Snap_Action.o: ../src/Fl_String.H
 Fd_Snap_Action.o: alignment_panel.h
 Fd_Snap_Action.o: code.h
 Fd_Snap_Action.o: Fd_Snap_Action.h
 Fd_Snap_Action.o: file.h
 Fd_Snap_Action.o: fluid.h
+Fd_Snap_Action.o: fluid_filename.h
 Fd_Snap_Action.o: Fl_Group_Type.h
 Fd_Snap_Action.o: Fl_Type.h
 Fd_Snap_Action.o: Fl_Widget_Type.h
@@ -560,7 +567,6 @@ file.o: ../FL/Fl_Shortcut_Button.H
 file.o: ../FL/Fl_Simple_Terminal.H
 file.o: ../FL/Fl_Slider.H
 file.o: ../FL/Fl_Spinner.H
-file.o: ../FL/Fl_String.H
 file.o: ../FL/fl_string_functions.h
 file.o: ../FL/Fl_Tabs.H
 file.o: ../FL/Fl_Text_Buffer.H
@@ -576,6 +582,7 @@ file.o: ../FL/Fl_Window.H
 file.o: ../FL/Fl_Wizard.H
 file.o: ../FL/platform_types.h
 file.o: ../src/flstring.h
+file.o: ../src/Fl_String.H
 file.o: alignment_panel.h
 file.o: code.h
 file.o: ExternalCodeEditor_UNIX.h
@@ -583,6 +590,7 @@ file.o: factory.h
 file.o: Fd_Snap_Action.h
 file.o: file.h
 file.o: fluid.h
+file.o: fluid_filename.h
 file.o: Fluid_Image.h
 file.o: Fl_Function_Type.h
 file.o: Fl_Group_Type.h
@@ -651,7 +659,6 @@ fluid.o: ../FL/Fl_Shortcut_Button.H
 fluid.o: ../FL/Fl_Simple_Terminal.H
 fluid.o: ../FL/Fl_Slider.H
 fluid.o: ../FL/Fl_Spinner.H
-fluid.o: ../FL/Fl_String.H
 fluid.o: ../FL/fl_string_functions.h
 fluid.o: ../FL/Fl_Tabs.H
 fluid.o: ../FL/Fl_Text_Buffer.H
@@ -668,6 +675,7 @@ fluid.o: ../FL/Fl_Window.H
 fluid.o: ../FL/Fl_Wizard.H
 fluid.o: ../FL/platform_types.h
 fluid.o: ../src/flstring.h
+fluid.o: ../src/Fl_String.H
 fluid.o: about_panel.h
 fluid.o: alignment_panel.h
 fluid.o: code.h
@@ -677,6 +685,7 @@ fluid.o: factory.h
 fluid.o: Fd_Snap_Action.h
 fluid.o: file.h
 fluid.o: fluid.h
+fluid.o: fluid_filename.h
 fluid.o: Fluid_Image.h
 fluid.o: Fl_Function_Type.h
 fluid.o: Fl_Group_Type.h
@@ -691,6 +700,21 @@ fluid.o: StyleParse.h
 fluid.o: template_panel.h
 fluid.o: undo.h
 fluid.o: widget_browser.h
+fluid_filename.o: ../config.h
+fluid_filename.o: ../FL/Enumerations.H
+fluid_filename.o: ../FL/filename.H
+fluid_filename.o: ../FL/Fl.H
+fluid_filename.o: ../FL/fl_attr.h
+fluid_filename.o: ../FL/Fl_Cairo.H
+fluid_filename.o: ../FL/fl_casts.H
+fluid_filename.o: ../FL/fl_config.h
+fluid_filename.o: ../FL/Fl_Export.H
+fluid_filename.o: ../FL/fl_string_functions.h
+fluid_filename.o: ../FL/fl_types.h
+fluid_filename.o: ../FL/fl_utf8.h
+fluid_filename.o: ../FL/platform_types.h
+fluid_filename.o: ../src/flstring.h
+fluid_filename.o: ../src/Fl_String.H
 Fluid_Image.o: ../config.h
 Fluid_Image.o: ../FL/Enumerations.H
 Fluid_Image.o: ../FL/filename.H
@@ -735,7 +759,6 @@ Fluid_Image.o: ../FL/Fl_Rect.H
 Fluid_Image.o: ../FL/Fl_Return_Button.H
 Fluid_Image.o: ../FL/Fl_RGB_Image.H
 Fluid_Image.o: ../FL/Fl_Shared_Image.H
-Fluid_Image.o: ../FL/Fl_String.H
 Fluid_Image.o: ../FL/fl_string_functions.h
 Fluid_Image.o: ../FL/Fl_SVG_Image.H
 Fluid_Image.o: ../FL/Fl_Tabs.H
@@ -747,9 +770,11 @@ Fluid_Image.o: ../FL/Fl_Window.H
 Fluid_Image.o: ../FL/Fl_Wizard.H
 Fluid_Image.o: ../FL/platform_types.h
 Fluid_Image.o: ../src/flstring.h
+Fluid_Image.o: ../src/Fl_String.H
 Fluid_Image.o: code.h
 Fluid_Image.o: file.h
 Fluid_Image.o: fluid.h
+Fluid_Image.o: fluid_filename.h
 Fluid_Image.o: Fluid_Image.h
 Fluid_Image.o: Fl_Group_Type.h
 Fluid_Image.o: Fl_Type.h
@@ -783,17 +808,18 @@ Fl_Button_Type.o: ../FL/Fl_Repeat_Button.H
 Fl_Button_Type.o: ../FL/Fl_Return_Button.H
 Fl_Button_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Button_Type.o: ../FL/Fl_Round_Button.H
-Fl_Button_Type.o: ../FL/Fl_String.H
 Fl_Button_Type.o: ../FL/Fl_Tabs.H
 Fl_Button_Type.o: ../FL/fl_types.h
 Fl_Button_Type.o: ../FL/fl_utf8.h
 Fl_Button_Type.o: ../FL/Fl_Widget.H
 Fl_Button_Type.o: ../FL/Fl_Wizard.H
 Fl_Button_Type.o: ../FL/platform_types.h
+Fl_Button_Type.o: ../src/Fl_String.H
 Fl_Button_Type.o: code.h
 Fl_Button_Type.o: Fd_Snap_Action.h
 Fl_Button_Type.o: file.h
 Fl_Button_Type.o: fluid.h
+Fl_Button_Type.o: fluid_filename.h
 Fl_Button_Type.o: Fl_Button_Type.h
 Fl_Button_Type.o: Fl_Group_Type.h
 Fl_Button_Type.o: Fl_Type.h
@@ -844,7 +870,6 @@ Fl_Function_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Function_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Function_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Function_Type.o: ../FL/Fl_Slider.H
-Fl_Function_Type.o: ../FL/Fl_String.H
 Fl_Function_Type.o: ../FL/fl_string_functions.h
 Fl_Function_Type.o: ../FL/Fl_Tabs.H
 Fl_Function_Type.o: ../FL/Fl_Text_Buffer.H
@@ -859,12 +884,14 @@ Fl_Function_Type.o: ../FL/Fl_Window.H
 Fl_Function_Type.o: ../FL/Fl_Wizard.H
 Fl_Function_Type.o: ../FL/platform_types.h
 Fl_Function_Type.o: ../src/flstring.h
+Fl_Function_Type.o: ../src/Fl_String.H
 Fl_Function_Type.o: code.h
 Fl_Function_Type.o: CodeEditor.h
 Fl_Function_Type.o: comments.h
 Fl_Function_Type.o: ExternalCodeEditor_UNIX.h
 Fl_Function_Type.o: file.h
 Fl_Function_Type.o: fluid.h
+Fl_Function_Type.o: fluid_filename.h
 Fl_Function_Type.o: Fluid_Image.h
 Fl_Function_Type.o: Fl_Function_Type.h
 Fl_Function_Type.o: Fl_Group_Type.h
@@ -884,6 +911,7 @@ Fl_Grid_Type.o: ../FL/Fl_Browser_.H
 Fl_Grid_Type.o: ../FL/Fl_Button.H
 Fl_Grid_Type.o: ../FL/Fl_Cairo.H
 Fl_Grid_Type.o: ../FL/fl_casts.H
+Fl_Grid_Type.o: ../FL/Fl_Choice.H
 Fl_Grid_Type.o: ../FL/fl_config.h
 Fl_Grid_Type.o: ../FL/Fl_Device.H
 Fl_Grid_Type.o: ../FL/fl_draw.H
@@ -895,6 +923,7 @@ Fl_Grid_Type.o: ../FL/Fl_Group.H
 Fl_Grid_Type.o: ../FL/Fl_Image.H
 Fl_Grid_Type.o: ../FL/Fl_Input.H
 Fl_Grid_Type.o: ../FL/Fl_Input_.H
+Fl_Grid_Type.o: ../FL/Fl_Menu_.H
 Fl_Grid_Type.o: ../FL/Fl_Menu_Item.H
 Fl_Grid_Type.o: ../FL/Fl_Pack.H
 Fl_Grid_Type.o: ../FL/Fl_Pixmap.H
@@ -904,7 +933,6 @@ Fl_Grid_Type.o: ../FL/Fl_Rect.H
 Fl_Grid_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Grid_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Grid_Type.o: ../FL/Fl_Slider.H
-Fl_Grid_Type.o: ../FL/Fl_String.H
 Fl_Grid_Type.o: ../FL/Fl_Tabs.H
 Fl_Grid_Type.o: ../FL/fl_types.h
 Fl_Grid_Type.o: ../FL/fl_utf8.h
@@ -914,11 +942,13 @@ Fl_Grid_Type.o: ../FL/Fl_Widget.H
 Fl_Grid_Type.o: ../FL/Fl_Wizard.H
 Fl_Grid_Type.o: ../FL/platform_types.h
 Fl_Grid_Type.o: ../src/flstring.h
+Fl_Grid_Type.o: ../src/Fl_String.H
 Fl_Grid_Type.o: code.h
 Fl_Grid_Type.o: custom_widgets.h
 Fl_Grid_Type.o: Fd_Snap_Action.h
 Fl_Grid_Type.o: file.h
 Fl_Grid_Type.o: fluid.h
+Fl_Grid_Type.o: fluid_filename.h
 Fl_Grid_Type.o: Fl_Grid_Type.h
 Fl_Grid_Type.o: Fl_Group_Type.h
 Fl_Grid_Type.o: Fl_Type.h
@@ -944,7 +974,6 @@ Fl_Group_Type.o: ../FL/Fl_Flex.H
 Fl_Group_Type.o: ../FL/Fl_Graphics_Driver.H
 Fl_Group_Type.o: ../FL/Fl_Group.H
 Fl_Group_Type.o: ../FL/Fl_Image.H
-Fl_Group_Type.o: ../FL/Fl_Int_Vector.H
 Fl_Group_Type.o: ../FL/Fl_Menu_Item.H
 Fl_Group_Type.o: ../FL/fl_message.H
 Fl_Group_Type.o: ../FL/Fl_Pack.H
@@ -956,7 +985,6 @@ Fl_Group_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Group_Type.o: ../FL/Fl_Scroll.H
 Fl_Group_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Group_Type.o: ../FL/Fl_Slider.H
-Fl_Group_Type.o: ../FL/Fl_String.H
 Fl_Group_Type.o: ../FL/Fl_Table.H
 Fl_Group_Type.o: ../FL/Fl_Tabs.H
 Fl_Group_Type.o: ../FL/fl_types.h
@@ -966,10 +994,12 @@ Fl_Group_Type.o: ../FL/Fl_Widget.H
 Fl_Group_Type.o: ../FL/Fl_Wizard.H
 Fl_Group_Type.o: ../FL/platform_types.h
 Fl_Group_Type.o: ../src/flstring.h
+Fl_Group_Type.o: ../src/Fl_String.H
 Fl_Group_Type.o: code.h
 Fl_Group_Type.o: Fd_Snap_Action.h
 Fl_Group_Type.o: file.h
 Fl_Group_Type.o: fluid.h
+Fl_Group_Type.o: fluid_filename.h
 Fl_Group_Type.o: Fl_Group_Type.h
 Fl_Group_Type.o: Fl_Type.h
 Fl_Group_Type.o: Fl_Widget_Type.h
@@ -1033,7 +1063,6 @@ Fl_Menu_Type.o: ../FL/Fl_Shortcut_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Menu_Type.o: ../FL/Fl_Slider.H
 Fl_Menu_Type.o: ../FL/Fl_Spinner.H
-Fl_Menu_Type.o: ../FL/Fl_String.H
 Fl_Menu_Type.o: ../FL/fl_string_functions.h
 Fl_Menu_Type.o: ../FL/Fl_Tabs.H
 Fl_Menu_Type.o: ../FL/Fl_Text_Buffer.H
@@ -1049,12 +1078,14 @@ Fl_Menu_Type.o: ../FL/Fl_Window.H
 Fl_Menu_Type.o: ../FL/Fl_Wizard.H
 Fl_Menu_Type.o: ../FL/platform_types.h
 Fl_Menu_Type.o: ../src/flstring.h
+Fl_Menu_Type.o: ../src/Fl_String.H
 Fl_Menu_Type.o: alignment_panel.h
 Fl_Menu_Type.o: code.h
 Fl_Menu_Type.o: custom_widgets.h
 Fl_Menu_Type.o: Fd_Snap_Action.h
 Fl_Menu_Type.o: file.h
 Fl_Menu_Type.o: fluid.h
+Fl_Menu_Type.o: fluid_filename.h
 Fl_Menu_Type.o: Fluid_Image.h
 Fl_Menu_Type.o: Fl_Button_Type.h
 Fl_Menu_Type.o: Fl_Group_Type.h
@@ -1092,7 +1123,6 @@ Fl_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Type.o: ../FL/Fl_Slider.H
-Fl_Type.o: ../FL/Fl_String.H
 Fl_Type.o: ../FL/Fl_Tabs.H
 Fl_Type.o: ../FL/fl_types.h
 Fl_Type.o: ../FL/fl_utf8.h
@@ -1101,11 +1131,13 @@ Fl_Type.o: ../FL/Fl_Widget.H
 Fl_Type.o: ../FL/Fl_Wizard.H
 Fl_Type.o: ../FL/platform_types.h
 Fl_Type.o: ../src/flstring.h
+Fl_Type.o: ../src/Fl_String.H
 Fl_Type.o: code.h
 Fl_Type.o: ExternalCodeEditor_UNIX.h
 Fl_Type.o: Fd_Snap_Action.h
 Fl_Type.o: file.h
 Fl_Type.o: fluid.h
+Fl_Type.o: fluid_filename.h
 Fl_Type.o: Fluid_Image.h
 Fl_Type.o: Fl_Function_Type.h
 Fl_Type.o: Fl_Group_Type.h
@@ -1148,7 +1180,6 @@ Fl_Widget_Type.o: ../FL/Fl_Input.H
 Fl_Widget_Type.o: ../FL/Fl_Input_.H
 Fl_Widget_Type.o: ../FL/Fl_Input_Choice.H
 Fl_Widget_Type.o: ../FL/Fl_Int_Input.H
-Fl_Widget_Type.o: ../FL/Fl_Int_Vector.H
 Fl_Widget_Type.o: ../FL/Fl_Light_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Menu.H
 Fl_Widget_Type.o: ../FL/Fl_Menu_.H
@@ -1175,7 +1206,6 @@ Fl_Widget_Type.o: ../FL/fl_show_colormap.H
 Fl_Widget_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Widget_Type.o: ../FL/Fl_Slider.H
 Fl_Widget_Type.o: ../FL/Fl_Spinner.H
-Fl_Widget_Type.o: ../FL/Fl_String.H
 Fl_Widget_Type.o: ../FL/fl_string_functions.h
 Fl_Widget_Type.o: ../FL/Fl_Table.H
 Fl_Widget_Type.o: ../FL/Fl_Tabs.H
@@ -1192,6 +1222,7 @@ Fl_Widget_Type.o: ../FL/Fl_Window.H
 Fl_Widget_Type.o: ../FL/Fl_Wizard.H
 Fl_Widget_Type.o: ../FL/platform_types.h
 Fl_Widget_Type.o: ../src/flstring.h
+Fl_Widget_Type.o: ../src/Fl_String.H
 Fl_Widget_Type.o: alignment_panel.h
 Fl_Widget_Type.o: code.h
 Fl_Widget_Type.o: CodeEditor.h
@@ -1200,6 +1231,7 @@ Fl_Widget_Type.o: ExternalCodeEditor_UNIX.h
 Fl_Widget_Type.o: Fd_Snap_Action.h
 Fl_Widget_Type.o: file.h
 Fl_Widget_Type.o: fluid.h
+Fl_Widget_Type.o: fluid_filename.h
 Fl_Widget_Type.o: Fluid_Image.h
 Fl_Widget_Type.o: Fl_Button_Type.h
 Fl_Widget_Type.o: Fl_Function_Type.h
@@ -1270,7 +1302,6 @@ Fl_Window_Type.o: ../FL/Fl_Shortcut_Button.H
 Fl_Window_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Window_Type.o: ../FL/Fl_Slider.H
 Fl_Window_Type.o: ../FL/Fl_Spinner.H
-Fl_Window_Type.o: ../FL/Fl_String.H
 Fl_Window_Type.o: ../FL/fl_string_functions.h
 Fl_Window_Type.o: ../FL/Fl_Tabs.H
 Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H
@@ -1288,6 +1319,7 @@ Fl_Window_Type.o: ../FL/platform.H
 Fl_Window_Type.o: ../FL/platform_types.h
 Fl_Window_Type.o: ../FL/x11.H
 Fl_Window_Type.o: ../src/flstring.h
+Fl_Window_Type.o: ../src/Fl_String.H
 Fl_Window_Type.o: alignment_panel.h
 Fl_Window_Type.o: code.h
 Fl_Window_Type.o: CodeEditor.h
@@ -1296,6 +1328,8 @@ Fl_Window_Type.o: factory.h
 Fl_Window_Type.o: Fd_Snap_Action.h
 Fl_Window_Type.o: file.h
 Fl_Window_Type.o: fluid.h
+Fl_Window_Type.o: fluid_filename.h
+Fl_Window_Type.o: Fl_Grid_Type.h
 Fl_Window_Type.o: Fl_Group_Type.h
 Fl_Window_Type.o: Fl_Type.h
 Fl_Window_Type.o: Fl_Widget_Type.h
@@ -1340,7 +1374,6 @@ function_panel.o: ../FL/Fl_Return_Button.H
 function_panel.o: ../FL/Fl_RGB_Image.H
 function_panel.o: ../FL/Fl_Scrollbar.H
 function_panel.o: ../FL/Fl_Slider.H
-function_panel.o: ../FL/Fl_String.H
 function_panel.o: ../FL/Fl_Text_Buffer.H
 function_panel.o: ../FL/Fl_Text_Display.H
 function_panel.o: ../FL/Fl_Text_Editor.H
@@ -1350,11 +1383,13 @@ function_panel.o: ../FL/Fl_Valuator.H
 function_panel.o: ../FL/Fl_Widget.H
 function_panel.o: ../FL/Fl_Window.H
 function_panel.o: ../FL/platform_types.h
+function_panel.o: ../src/Fl_String.H
 function_panel.o: code.h
 function_panel.o: CodeEditor.h
 function_panel.o: custom_widgets.h
 function_panel.o: factory.h
 function_panel.o: fluid.h
+function_panel.o: fluid_filename.h
 function_panel.o: Fl_Type.h
 function_panel.o: function_panel.h
 function_panel.o: pixmaps.h
@@ -1376,10 +1411,10 @@ pixmaps.o: ../FL/Fl_Plugin.H
 pixmaps.o: ../FL/Fl_Preferences.H
 pixmaps.o: ../FL/Fl_Rect.H
 pixmaps.o: ../FL/Fl_RGB_Image.H
-pixmaps.o: ../FL/Fl_String.H
 pixmaps.o: ../FL/fl_types.h
 pixmaps.o: ../FL/Fl_Widget.H
 pixmaps.o: ../FL/platform_types.h
+pixmaps.o: ../src/Fl_String.H
 pixmaps.o: code.h
 pixmaps.o: Fl_Type.h
 pixmaps.o: pixmaps.h
@@ -1497,7 +1532,6 @@ shell_command.o: ../FL/Fl_Shortcut_Button.H
 shell_command.o: ../FL/Fl_Simple_Terminal.H
 shell_command.o: ../FL/Fl_Slider.H
 shell_command.o: ../FL/Fl_Spinner.H
-shell_command.o: ../FL/Fl_String.H
 shell_command.o: ../FL/fl_string_functions.h
 shell_command.o: ../FL/Fl_Tabs.H
 shell_command.o: ../FL/Fl_Text_Buffer.H
@@ -1512,11 +1546,13 @@ shell_command.o: ../FL/Fl_Widget.H
 shell_command.o: ../FL/Fl_Window.H
 shell_command.o: ../FL/Fl_Wizard.H
 shell_command.o: ../FL/platform_types.h
+shell_command.o: ../src/Fl_String.H
 shell_command.o: alignment_panel.h
 shell_command.o: code.h
 shell_command.o: Fd_Snap_Action.h
 shell_command.o: file.h
 shell_command.o: fluid.h
+shell_command.o: fluid_filename.h
 shell_command.o: Fl_Group_Type.h
 shell_command.o: Fl_Type.h
 shell_command.o: Fl_Widget_Type.h
@@ -1550,7 +1586,6 @@ sourceview_panel.o: ../FL/Fl_Rect.H
 sourceview_panel.o: ../FL/Fl_RGB_Image.H
 sourceview_panel.o: ../FL/Fl_Scrollbar.H
 sourceview_panel.o: ../FL/Fl_Slider.H
-sourceview_panel.o: ../FL/Fl_String.H
 sourceview_panel.o: ../FL/Fl_Tabs.H
 sourceview_panel.o: ../FL/Fl_Text_Buffer.H
 sourceview_panel.o: ../FL/Fl_Text_Display.H
@@ -1562,10 +1597,12 @@ sourceview_panel.o: ../FL/Fl_Widget.H
 sourceview_panel.o: ../FL/Fl_Window.H
 sourceview_panel.o: ../FL/platform_types.h
 sourceview_panel.o: ../src/flstring.h
+sourceview_panel.o: ../src/Fl_String.H
 sourceview_panel.o: code.h
 sourceview_panel.o: CodeEditor.h
 sourceview_panel.o: file.h
 sourceview_panel.o: fluid.h
+sourceview_panel.o: fluid_filename.h
 sourceview_panel.o: Fl_Type.h
 sourceview_panel.o: sourceview_panel.h
 sourceview_panel.o: StyleParse.h
@@ -1593,7 +1630,6 @@ template_panel.o: ../FL/Fl_Menu_Item.H
 template_panel.o: ../FL/Fl_Preferences.H
 template_panel.o: ../FL/Fl_Return_Button.H
 template_panel.o: ../FL/Fl_Shared_Image.H
-template_panel.o: ../FL/Fl_String.H
 template_panel.o: ../FL/fl_string_functions.h
 template_panel.o: ../FL/fl_types.h
 template_panel.o: ../FL/fl_utf8.h
@@ -1601,7 +1637,9 @@ template_panel.o: ../FL/Fl_Widget.H
 template_panel.o: ../FL/Fl_Window.H
 template_panel.o: ../FL/platform_types.h
 template_panel.o: ../src/flstring.h
+template_panel.o: ../src/Fl_String.H
 template_panel.o: fluid.h
+template_panel.o: fluid_filename.h
 template_panel.o: template_panel.h
 undo.o: ../config.h
 undo.o: ../FL/Enumerations.H
@@ -1628,7 +1666,6 @@ undo.o: ../FL/Fl_Rect.H
 undo.o: ../FL/Fl_RGB_Image.H
 undo.o: ../FL/Fl_Scrollbar.H
 undo.o: ../FL/Fl_Slider.H
-undo.o: ../FL/Fl_String.H
 undo.o: ../FL/fl_types.h
 undo.o: ../FL/fl_utf8.h
 undo.o: ../FL/Fl_Valuator.H
@@ -1636,9 +1673,11 @@ undo.o: ../FL/Fl_Widget.H
 undo.o: ../FL/Fl_Window.H
 undo.o: ../FL/platform_types.h
 undo.o: ../src/flstring.h
+undo.o: ../src/Fl_String.H
 undo.o: code.h
 undo.o: file.h
 undo.o: fluid.h
+undo.o: fluid_filename.h
 undo.o: Fl_Type.h
 undo.o: Fl_Widget_Type.h
 undo.o: undo.h
@@ -1665,14 +1704,15 @@ widget_browser.o: ../FL/Fl_Rect.H
 widget_browser.o: ../FL/Fl_RGB_Image.H
 widget_browser.o: ../FL/Fl_Scrollbar.H
 widget_browser.o: ../FL/Fl_Slider.H
-widget_browser.o: ../FL/Fl_String.H
 widget_browser.o: ../FL/fl_types.h
 widget_browser.o: ../FL/fl_utf8.h
 widget_browser.o: ../FL/Fl_Valuator.H
 widget_browser.o: ../FL/Fl_Widget.H
 widget_browser.o: ../FL/platform_types.h
+widget_browser.o: ../src/Fl_String.H
 widget_browser.o: code.h
 widget_browser.o: fluid.h
+widget_browser.o: fluid_filename.h
 widget_browser.o: Fl_Type.h
 widget_browser.o: Fl_Widget_Type.h
 widget_browser.o: pixmaps.h
@@ -1712,7 +1752,6 @@ widget_panel.o: ../FL/Fl_RGB_Image.H
 widget_panel.o: ../FL/Fl_Scrollbar.H
 widget_panel.o: ../FL/Fl_Shortcut_Button.H
 widget_panel.o: ../FL/Fl_Slider.H
-widget_panel.o: ../FL/Fl_String.H
 widget_panel.o: ../FL/Fl_Tabs.H
 widget_panel.o: ../FL/Fl_Text_Buffer.H
 widget_panel.o: ../FL/Fl_Text_Display.H
@@ -1725,6 +1764,7 @@ widget_panel.o: ../FL/Fl_Value_Input.H
 widget_panel.o: ../FL/Fl_Widget.H
 widget_panel.o: ../FL/Fl_Window.H
 widget_panel.o: ../FL/platform_types.h
+widget_panel.o: ../src/Fl_String.H
 widget_panel.o: code.h
 widget_panel.o: CodeEditor.h
 widget_panel.o: custom_widgets.h