diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-01-16 19:02:36 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-01-16 19:47:16 +0100 |
| commit | 92e9181a0a885b2b58e002e3a5e76152763388a2 (patch) | |
| tree | e1571e122ecf1d4ca394883728eb6df75f3e94d8 | |
| parent | 8213ba94aa2b1a83f7da8b603935811c05c7def5 (diff) | |
Rename FL/fl_string.h to FL/fl_string_functions.h
This is part 1 of the final fix for a previous name clash on case
insensitive file systems (fl_string.h vs. Fl_String.H).
62 files changed, 117 insertions, 101 deletions
diff --git a/FL/fl_string.h b/FL/fl_string_functions.h index adcefa492..2e7d0e995 100644 --- a/FL/fl_string.h +++ b/FL/fl_string_functions.h @@ -1,7 +1,7 @@ /* * Platform agnostic string portability functions for the Fast Light Tool Kit (FLTK). * - * Copyright 2020 by Bill Spitzak and others. + * Copyright 2020-2022 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 @@ -15,12 +15,12 @@ */ /** - \file fl_string.h + \file fl_string_functions.h \brief Public header for FLTK's own platform agnostic string handling. */ -#ifndef _FL_fl_string_h_ -#define _FL_fl_string_h_ +#ifndef _FL_fl_string_functions_h_ +#define _FL_fl_string_functions_h_ #include "Fl_Export.H" #include "fl_types.h" @@ -44,4 +44,4 @@ FL_EXPORT char* fl_strdup(const char *s); #endif /* __cplusplus */ -#endif /* _FL_fl_string_h_ */ +#endif /* _FL_fl_string_functions_h_ */ diff --git a/fluid/ExternalCodeEditor_UNIX.cxx b/fluid/ExternalCodeEditor_UNIX.cxx index 8ff27d036..e7c79d9f0 100644 --- a/fluid/ExternalCodeEditor_UNIX.cxx +++ b/fluid/ExternalCodeEditor_UNIX.cxx @@ -9,7 +9,7 @@ #include <FL/Fl.H> /* Fl_Timeout_Handler.. */ #include <FL/fl_ask.H> /* fl_alert() */ -#include <FL/fl_string.h> /* fl_strdup() */ +#include <FL/fl_string_functions.h> /* fl_strdup() */ #include <errno.h> /* errno */ #include <string.h> /* strerror() */ diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx index a137b3e6f..5536947cf 100644 --- a/fluid/ExternalCodeEditor_WIN32.cxx +++ b/fluid/ExternalCodeEditor_WIN32.cxx @@ -19,7 +19,7 @@ #include <FL/Fl.H> // Fl_Timeout_Handler.. #include <FL/fl_ask.H> // fl_alert() #include <FL/fl_utf8.h> // fl_utf8fromwc() -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include "ExternalCodeEditor_WIN32.h" diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx index a4ab673a0..3c728863e 100644 --- a/fluid/Fl_Function_Type.cxx +++ b/fluid/Fl_Function_Type.cxx @@ -25,7 +25,7 @@ #include "function_panel.h" #include "comments.h" -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/Fl_File_Chooser.H> #include <FL/fl_ask.H> #include "../src/flstring.h" diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx index a63355a32..58f5b8dfb 100644 --- a/fluid/Fluid_Image.cxx +++ b/fluid/Fluid_Image.cxx @@ -26,7 +26,7 @@ #include <FL/Fl_Widget.H> #include <FL/Fl_Window.H> #include <FL/filename.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/fl_utf8.h> // fl_fopen() #include <FL/Fl_File_Chooser.H> #include "../src/flstring.h" diff --git a/fluid/code.cxx b/fluid/code.cxx index 7de06ea00..ba57ae8b8 100644 --- a/fluid/code.cxx +++ b/fluid/code.cxx @@ -23,7 +23,7 @@ #include "file.h" #include <FL/Fl.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/filename.H> #include "../src/flstring.h" diff --git a/fluid/file.cxx b/fluid/file.cxx index 0e6fbe4d2..39768ea2e 100644 --- a/fluid/file.cxx +++ b/fluid/file.cxx @@ -33,7 +33,7 @@ #include <FL/Fl.H> #include <FL/Fl_Group.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/fl_message.H> #include "../src/flstring.h" diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 95568d63f..1ed1ad93b 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -42,7 +42,7 @@ #include <FL/Fl_PNG_Image.H> #include <FL/Fl_Native_File_Chooser.H> #include <FL/Fl_Printer.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <locale.h> // setlocale().. #include "../src/flstring.h" diff --git a/fluid/makedepend b/fluid/makedepend index d9f4a0dd7..ad6d1850d 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -151,7 +151,7 @@ code.o: ../FL/Fl_Shared_Image.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 code.o: ../FL/Fl_Text_Display.H @@ -217,8 +217,8 @@ ExternalCodeEditor_UNIX.o: ../FL/fl_config.h ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.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_class.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/platform_types.h @@ -339,8 +339,8 @@ file.o: ../FL/Fl_Shared_Image.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_class.H +file.o: ../FL/fl_string_functions.h file.o: ../FL/Fl_Tabs.H file.o: ../FL/Fl_Text_Buffer.H file.o: ../FL/Fl_Text_Display.H @@ -421,8 +421,8 @@ fluid.o: ../FL/Fl_Shared_Image.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_class.H +fluid.o: ../FL/fl_string_functions.h fluid.o: ../FL/Fl_Tabs.H fluid.o: ../FL/Fl_Text_Buffer.H fluid.o: ../FL/Fl_Text_Display.H @@ -500,8 +500,8 @@ 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_class.H +Fluid_Image.o: ../FL/fl_string_functions.h Fluid_Image.o: ../FL/Fl_Tabs.H Fluid_Image.o: ../FL/Fl_Tile.H Fluid_Image.o: ../FL/fl_types.h @@ -563,8 +563,8 @@ 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_class.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 Fl_Function_Type.o: ../FL/Fl_Text_Display.H @@ -1071,8 +1071,8 @@ shell_command.o: ../FL/Fl_Scrollbar.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_class.H +shell_command.o: ../FL/fl_string_functions.h shell_command.o: ../FL/Fl_Tabs.H shell_command.o: ../FL/Fl_Text_Buffer.H shell_command.o: ../FL/Fl_Text_Display.H @@ -1169,8 +1169,8 @@ 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_class.H +template_panel.o: ../FL/fl_string_functions.h template_panel.o: ../FL/fl_types.h template_panel.o: ../FL/fl_utf8.h template_panel.o: ../FL/Fl_Widget.H diff --git a/fluid/print_panel.cxx b/fluid/print_panel.cxx index 0d688d403..3633c8ace 100644 --- a/fluid/print_panel.cxx +++ b/fluid/print_panel.cxx @@ -18,7 +18,7 @@ #include "print_panel.h" #include "fluid.h" -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "../src/flstring.h" #include <stdlib.h> #include <stdio.h> diff --git a/fluid/print_panel.fl b/fluid/print_panel.fl index 48cb43ead..e85f3493b 100644 --- a/fluid/print_panel.fl +++ b/fluid/print_panel.fl @@ -23,7 +23,7 @@ comment {// decl {\#include "fluid.h"} {private local } -decl {\#include <FL/fl_string.h>} {private local +decl {\#include <FL/fl_string_functions.h>} {private local } decl {\#include "../src/flstring.h"} {private local diff --git a/fluid/shell_command.cxx b/fluid/shell_command.cxx index 147525989..630b84b1f 100644 --- a/fluid/shell_command.cxx +++ b/fluid/shell_command.cxx @@ -21,7 +21,7 @@ #include <FL/Fl_Double_Window.H> #include <FL/fl_message.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <errno.h> diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx index 0c4db0d32..b23bc9668 100644 --- a/fluid/template_panel.cxx +++ b/fluid/template_panel.cxx @@ -20,7 +20,7 @@ #include "fluid.h" #include <FL/Fl_Shared_Image.H> #include <FL/fl_ask.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/filename.H> #include "../src/flstring.h" #include <stdio.h> diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl index 9407a7564..7b5f9b1c3 100644 --- a/fluid/template_panel.fl +++ b/fluid/template_panel.fl @@ -29,7 +29,7 @@ decl {\#include <FL/Fl_Shared_Image.H>} {private local decl {\#include <FL/fl_ask.H>} {private local } -decl {\#include <FL/fl_string.h>} {private local +decl {\#include <FL/fl_string_functions.h>} {private local } decl {\#include <FL/filename.H>} {selected private local diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a86f5ce2d..d11dc1fe2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -156,7 +156,7 @@ set (CPPFILES fl_shadow_box.cxx fl_shortcut.cxx fl_show_colormap.cxx - fl_string.cxx + fl_string_functions.cxx fl_symbols.cxx fl_utf8.cxx fl_vertex.cxx diff --git a/src/Fl_Check_Browser.cxx b/src/Fl_Check_Browser.cxx index a05c4e409..d831c3cb2 100644 --- a/src/Fl_Check_Browser.cxx +++ b/src/Fl_Check_Browser.cxx @@ -18,7 +18,7 @@ #include <stdlib.h> #include "flstring.h" #include <FL/fl_draw.H> -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include <FL/Fl_Check_Browser.H> /* This uses a cache for faster access when you're scanning the list diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index da70c8752..e3a70aa3b 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -34,7 +34,7 @@ #include "Fl_System_Driver.H" #include <FL/fl_draw.H> #include <FL/filename.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/Fl_Image.H> // icon #include <stdio.h> #include <stdlib.h> diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index 363adf721..ca17df124 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -354,7 +354,7 @@ #include <FL/platform.H> #include <FL/Fl_Shared_Image.H> #include <FL/fl_draw.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 7f7c8e28a..3ccafc2a8 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -56,7 +56,7 @@ #include <stdlib.h> #include <FL/fl_utf8.h> #include <FL/filename.H> // fl_open_uri() -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include "flstring.h" #include <ctype.h> #include <errno.h> diff --git a/src/Fl_Image_Reader.cxx b/src/Fl_Image_Reader.cxx index e15d3434e..a3cc3f30a 100644 --- a/src/Fl_Image_Reader.cxx +++ b/src/Fl_Image_Reader.cxx @@ -22,7 +22,7 @@ #include "Fl_Image_Reader.h" #include <FL/fl_utf8.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <stdlib.h> #include <string.h> diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index e529f0769..3320d0fa4 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -17,7 +17,7 @@ #if defined(__APPLE__) #include <FL/platform.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H" #include "flstring.h" #include <stdio.h> diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx index 5231e883d..cd6bde434 100644 --- a/src/Fl_Menu_add.cxx +++ b/src/Fl_Menu_add.cxx @@ -25,7 +25,7 @@ // string with a % sign in it! #include <FL/Fl_Menu_.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "flstring.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/Fl_Message.cxx b/src/Fl_Message.cxx index 8a44418e9..5c27d2f89 100644 --- a/src/Fl_Message.cxx +++ b/src/Fl_Message.cxx @@ -47,7 +47,7 @@ #include "flstring.h" #include <FL/fl_ask.H> #include "Fl_Message.h" // intentionally "hidden" in src/... -#include "FL/fl_string.h" // fl_strdup() +#include "FL/fl_string_functions.h" // fl_strdup() #include <FL/Fl_Window.H> #include <FL/Fl_Box.H> diff --git a/src/Fl_Native_File_Chooser_GTK.cxx b/src/Fl_Native_File_Chooser_GTK.cxx index bfb3dbe9d..b422dc711 100644 --- a/src/Fl_Native_File_Chooser_GTK.cxx +++ b/src/Fl_Native_File_Chooser_GTK.cxx @@ -26,7 +26,7 @@ #include <FL/Fl_Shared_Image.H> #include <FL/Fl_Image_Surface.H> #include <FL/fl_draw.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <dlfcn.h> // for dlopen et al #include "drivers/X11/Fl_X11_System_Driver.H" #include "Fl_Window_Driver.H" diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm index 9c4b8b8e3..ae0072fee 100644 --- a/src/Fl_Native_File_Chooser_MAC.mm +++ b/src/Fl_Native_File_Chooser_MAC.mm @@ -27,7 +27,7 @@ #include <FL/Fl_Native_File_Chooser.H> #include <FL/Fl_File_Chooser.H> #include <FL/filename.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #define MAXFILTERS 80 #import <Cocoa/Cocoa.h> diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx index 71d98f04c..53e10de41 100644 --- a/src/Fl_Native_File_Chooser_WIN32.cxx +++ b/src/Fl_Native_File_Chooser_WIN32.cxx @@ -29,7 +29,7 @@ #define FNFC_MAX_PATH 32768 // XXX: MAX_PATH under win32 is 260, too small for modern use -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include "flstring.h" // fl_strlcpy()/cat() #include <FL/Fl_Native_File_Chooser.H> # include <windows.h> diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx index 4b14fe37a..0ac1c17ea 100644 --- a/src/Fl_Preferences.cxx +++ b/src/Fl_Preferences.cxx @@ -25,7 +25,7 @@ #include <stdlib.h> #include <stdarg.h> #include <FL/fl_utf8.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "flstring.h" diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx index 7436bdee8..57839bf78 100644 --- a/src/Fl_SVG_Image.cxx +++ b/src/Fl_SVG_Image.cxx @@ -21,7 +21,7 @@ #include <FL/Fl_SVG_Image.H> #include <FL/fl_utf8.h> #include <FL/fl_draw.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "Fl_Screen_Driver.H" #include <stdio.h> #include <stdlib.h> diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index 476f1ec61..410492957 100644 --- a/src/Fl_Text_Buffer.cxx +++ b/src/Fl_Text_Buffer.cxx @@ -17,7 +17,7 @@ #include <stdio.h> #include <stdlib.h> #include <FL/fl_utf8.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "flstring.h" #include <ctype.h> #include <FL/Fl.H> diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index faeafc090..6612595bd 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -20,7 +20,7 @@ #include <stdio.h> #include <stdlib.h> #include <FL/fl_utf8.h> -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include "flstring.h" #include <limits.h> #include <ctype.h> diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index 2d2eb2021..35898dc05 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -18,7 +18,7 @@ #include <FL/fl_draw.H> #include <FL/Fl_Menu_Window.H> #include <FL/Fl.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "Fl_System_Driver.H" #include <stdio.h> diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx index 5dab99c2a..1f808cacf 100644 --- a/src/Fl_Tree.cxx +++ b/src/Fl_Tree.cxx @@ -6,7 +6,7 @@ #include <FL/Fl_Tree.H> #include <FL/Fl_Preferences.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> ////////////////////// // Fl_Tree.cxx diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx index da66a2157..d9b94d2f5 100644 --- a/src/Fl_Tree_Item.cxx +++ b/src/Fl_Tree_Item.cxx @@ -8,7 +8,7 @@ #include <FL/Fl_Tree_Item.H> #include <FL/Fl_Tree_Prefs.H> #include <FL/Fl_Tree.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> ////////////////////// // Fl_Tree_Item.cxx diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx index 16bf7bc5d..185e99b58 100644 --- a/src/Fl_Widget.cxx +++ b/src/Fl_Widget.cxx @@ -19,7 +19,7 @@ #include <FL/Fl_Group.H> #include <FL/Fl_Tooltip.H> #include <FL/fl_draw.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <stdlib.h> #include "flstring.h" diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index 063a8b0b2..77090dc0b 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -28,7 +28,7 @@ #include <FL/Fl_Window.H> #include <FL/Fl_Tooltip.H> #include <FL/fl_draw.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <stdlib.h> #include "flstring.h" diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 6da31ad43..0b8fc3417 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -32,7 +32,7 @@ extern "C" { #include <FL/Fl_Printer.H> #include <FL/fl_draw.H> #include <FL/Fl_Rect.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "drivers/Quartz/Fl_Quartz_Graphics_Driver.H" #include "drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H" #include "drivers/Cocoa/Fl_Cocoa_Screen_Driver.H" diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 73388c835..7f049f62e 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -21,7 +21,7 @@ #include <FL/platform.H> #include <FL/math.h> #include <FL/fl_utf8.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "flstring.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 20fc5ea13..5ee2fe45a 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -60,7 +60,7 @@ void fl_cleanup_dc_list(void); #include "drivers/WinAPI/Fl_WinAPI_Screen_Driver.H" #include "drivers/GDI/Fl_GDI_Graphics_Driver.H" #include <FL/fl_utf8.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/Fl_Window.H> #include <FL/fl_draw.H> #include <FL/Enumerations.H> diff --git a/src/Makefile b/src/Makefile index 47c0615cc..6c0b1e6d4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -158,7 +158,7 @@ CPPFILES = \ fl_shadow_box.cxx \ fl_shortcut.cxx \ fl_show_colormap.cxx \ - fl_string.cxx \ + fl_string_functions.cxx \ fl_symbols.cxx \ fl_utf8.cxx \ fl_vertex.cxx \ diff --git a/src/drivers/Android/Fl_Android_Application.cxx b/src/drivers/Android/Fl_Android_Application.cxx index 793ebb5a1..32feee193 100644 --- a/src/drivers/Android/Fl_Android_Application.cxx +++ b/src/drivers/Android/Fl_Android_Application.cxx @@ -25,7 +25,7 @@ #include <FL/platform.H> #include <FL/fl_draw.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <jni.h> diff --git a/src/drivers/Android/Fl_Android_System_Driver.H b/src/drivers/Android/Fl_Android_System_Driver.H index 5e6dafb1e..585535d43 100644 --- a/src/drivers/Android/Fl_Android_System_Driver.H +++ b/src/drivers/Android/Fl_Android_System_Driver.H @@ -23,7 +23,7 @@ #define FL_ANDROID_SYSTEM_DRIVER_H #include <string.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "../../Fl_System_Driver.H" #include <stdarg.h> diff --git a/src/drivers/Android/Fl_Android_System_Driver.cxx b/src/drivers/Android/Fl_Android_System_Driver.cxx index 5c8b45335..f164a7c14 100644 --- a/src/drivers/Android/Fl_Android_System_Driver.cxx +++ b/src/drivers/Android/Fl_Android_System_Driver.cxx @@ -18,7 +18,7 @@ #include "Fl_Android_System_Driver.H" #include <FL/Fl.H> #include <FL/fl_utf8.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/filename.H> #include <FL/Fl_File_Browser.H> #include <FL/Fl_File_Icon.H> diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm index 1f7511c9e..0637d1b66 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm @@ -26,7 +26,7 @@ #include <FL/platform.H> #include <FL/fl_ask.H> #include <FL/fl_draw.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #import <Cocoa/Cocoa.h> typedef OSStatus (*PMSessionSetDocumentFormatGeneration_type)( diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx index 140ddae63..2315c875c 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx @@ -43,7 +43,7 @@ #include <stdio.h> #include <stdlib.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> // This function fills in the FLTK font table with all the fonts that // are found on the X server. It tries to place the fonts into families diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx index b1a30235d..d64a8fdcf 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx +++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx @@ -19,7 +19,7 @@ #include "../../flstring.h" #include <FL/Fl_File_Icon.H> #include <FL/filename.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/Fl.H> #include <locale.h> #include <stdio.h> diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index 11d61e4f3..38407d5c4 100644 --- a/src/drivers/PostScript/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -24,7 +24,7 @@ #include <FL/Fl_PostScript.H> #include <FL/Fl_Native_File_Chooser.H> #include "../../Fl_System_Driver.H" -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/platform.H> #include <stdarg.h> #include <time.h> diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index 335e02826..b89e359ad 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -75,7 +75,7 @@ #include <FL/Fl.H> #include <FL/platform.H> #include <FL/fl_utf8.h> // for fl_utf8toUtf16() -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() Fl_Fontdesc* fl_fonts = NULL; diff --git a/src/drivers/SVG/Fl_SVG_File_Surface.cxx b/src/drivers/SVG/Fl_SVG_File_Surface.cxx index 371e618e1..701289ac6 100644 --- a/src/drivers/SVG/Fl_SVG_File_Surface.cxx +++ b/src/drivers/SVG/Fl_SVG_File_Surface.cxx @@ -28,7 +28,7 @@ #include <FL/Fl_RGB_Image.H> #include <FL/Fl_Pixmap.H> #include <FL/Fl_Bitmap.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <stdlib.h> extern "C" { diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index 61e18d90b..a869b8ca0 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -19,7 +19,7 @@ #include "Fl_WinAPI_System_Driver.H" #include <FL/Fl.H> #include <FL/fl_utf8.h> -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include <FL/filename.H> #include <FL/Fl_File_Browser.H> #include <FL/Fl_File_Icon.H> diff --git a/src/drivers/X11/Fl_X11_System_Driver.cxx b/src/drivers/X11/Fl_X11_System_Driver.cxx index 7868ae3a1..fcd1d2d5e 100644 --- a/src/drivers/X11/Fl_X11_System_Driver.cxx +++ b/src/drivers/X11/Fl_X11_System_Driver.cxx @@ -17,7 +17,7 @@ #include "Fl_X11_System_Driver.H" #include <FL/Fl_File_Browser.H> -#include <FL/fl_string.h> // fl_strdup +#include <FL/fl_string_functions.h> // fl_strdup #include <FL/platform.H> #include "../../flstring.h" diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx index 9251eafe4..30e31b2b1 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx @@ -20,7 +20,7 @@ #include <FL/Fl.H> #include <FL/fl_draw.H> #include <FL/platform.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "Fl_Font.H" #include <stdio.h> diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx index 66a139ea2..5e27c71bc 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx @@ -20,7 +20,7 @@ #include "Fl_Xlib_Graphics_Driver.H" #include <FL/Fl.H> #include <FL/fl_draw.H> -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include <FL/platform.H> #include "Fl_Font.H" diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx index e39da321d..4e4e8ff56 100644 --- a/src/filename_absolute.cxx +++ b/src/filename_absolute.cxx @@ -22,7 +22,7 @@ #include <FL/filename.H> #include <FL/Fl.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include "Fl_System_Driver.H" #include <stdlib.h> #include "flstring.h" diff --git a/src/fl_string.cxx b/src/fl_string_functions.cxx index c53c0e21f..6b7fcead7 100644 --- a/src/fl_string.cxx +++ b/src/fl_string_functions.cxx @@ -14,7 +14,7 @@ * https://www.fltk.org/bugs.php */ -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <string.h> // strdup/_strdup #include "Fl_System_Driver.H" diff --git a/src/fl_write_png.cxx b/src/fl_write_png.cxx index 6d9c7fe89..0f980476a 100644 --- a/src/fl_write_png.cxx +++ b/src/fl_write_png.cxx @@ -17,7 +17,7 @@ #include <config.h> #include <FL/Fl_PNG_Image.H> #include <FL/Fl_RGB_Image.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <FL/fl_utf8.h> // fl_fopen() #include <stdio.h> #include <time.h> // hack to restore "configure --enable-x11" on macOS ≥ 11 diff --git a/src/makedepend b/src/makedepend index 1c9903de0..75ab4c5f1 100644 --- a/src/makedepend +++ b/src/makedepend @@ -215,8 +215,8 @@ drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Repeat_Button.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Return_Button.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Round_Button.H drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Spinner.H -drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_string.h drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_String_class.H +drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_string_functions.h drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_types.h drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_utf8.h drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Widget.H @@ -240,7 +240,7 @@ drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_config.h drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_Export.H drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_File_Icon.H drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_Preferences.H -drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_string.h +drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_string_functions.h drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_types.h drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_utf8.h drivers/Posix/Fl_Posix_System_Driver.o: ../FL/platform_types.h @@ -284,8 +284,8 @@ drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Plugin.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_PostScript.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Preferences.H drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Return_Button.H -drivers/PostScript/Fl_PostScript.o: ../FL/fl_string.h drivers/PostScript/Fl_PostScript.o: ../FL/Fl_String_class.H +drivers/PostScript/Fl_PostScript.o: ../FL/fl_string_functions.h drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Tile.H drivers/PostScript/Fl_PostScript.o: ../FL/fl_types.h drivers/PostScript/Fl_PostScript.o: ../FL/fl_utf8.h @@ -338,7 +338,7 @@ drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Pixmap.H drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Plugin.H drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Preferences.H drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_RGB_Image.H -drivers/SVG/Fl_SVG_File_Surface.o: ../FL/fl_string.h +drivers/SVG/Fl_SVG_File_Surface.o: ../FL/fl_string_functions.h drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_SVG_File_Surface.H drivers/SVG/Fl_SVG_File_Surface.o: ../FL/fl_types.h drivers/SVG/Fl_SVG_File_Surface.o: ../FL/fl_utf8.h @@ -450,7 +450,7 @@ drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_Export.H drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_File_Browser.H drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_File_Icon.H drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_Preferences.H -drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_string.h +drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_string_functions.h drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_types.h drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_utf8.h drivers/X11/Fl_X11_System_Driver.o: ../FL/platform.H @@ -621,7 +621,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Pixmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Plugin.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Preferences.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_RGB_Image.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_string.h +drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_string_functions.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_utf8.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Widget.H @@ -787,7 +787,7 @@ filename_absolute.o: ../FL/fl_casts.H filename_absolute.o: ../FL/fl_config.h filename_absolute.o: ../FL/Fl_Export.H filename_absolute.o: ../FL/Fl_Preferences.H -filename_absolute.o: ../FL/fl_string.h +filename_absolute.o: ../FL/fl_string_functions.h filename_absolute.o: ../FL/fl_types.h filename_absolute.o: ../FL/fl_utf8.h filename_absolute.o: ../FL/platform_types.h @@ -1147,7 +1147,7 @@ Fl_Check_Browser.o: ../FL/Fl_Export.H Fl_Check_Browser.o: ../FL/Fl_Group.H Fl_Check_Browser.o: ../FL/Fl_Scrollbar.H Fl_Check_Browser.o: ../FL/Fl_Slider.H -Fl_Check_Browser.o: ../FL/fl_string.h +Fl_Check_Browser.o: ../FL/fl_string_functions.h Fl_Check_Browser.o: ../FL/fl_types.h Fl_Check_Browser.o: ../FL/fl_utf8.h Fl_Check_Browser.o: ../FL/Fl_Valuator.H @@ -1550,7 +1550,7 @@ Fl_File_Browser.o: ../FL/Fl_File_Browser.H Fl_File_Browser.o: ../FL/Fl_File_Icon.H Fl_File_Browser.o: ../FL/Fl_Image.H Fl_File_Browser.o: ../FL/Fl_Preferences.H -Fl_File_Browser.o: ../FL/fl_string.h +Fl_File_Browser.o: ../FL/fl_string_functions.h Fl_File_Browser.o: ../FL/fl_types.h Fl_File_Browser.o: ../FL/fl_utf8.h Fl_File_Browser.o: ../FL/Fl_Widget.H @@ -1627,8 +1627,8 @@ Fl_File_Chooser2.o: ../FL/Fl_Menu_Item.H Fl_File_Chooser2.o: ../FL/Fl_Preferences.H Fl_File_Chooser2.o: ../FL/Fl_Return_Button.H Fl_File_Chooser2.o: ../FL/Fl_Shared_Image.H -Fl_File_Chooser2.o: ../FL/fl_string.h Fl_File_Chooser2.o: ../FL/Fl_String_class.H +Fl_File_Chooser2.o: ../FL/fl_string_functions.h Fl_File_Chooser2.o: ../FL/Fl_Tile.H Fl_File_Chooser2.o: ../FL/fl_types.h Fl_File_Chooser2.o: ../FL/fl_utf8.h @@ -1774,7 +1774,7 @@ Fl_get_system_colors.o: ../FL/Fl_Rect.H Fl_get_system_colors.o: ../FL/Fl_RGB_Image.H Fl_get_system_colors.o: ../FL/Fl_Scrollbar.H Fl_get_system_colors.o: ../FL/Fl_Slider.H -Fl_get_system_colors.o: ../FL/fl_string.h +Fl_get_system_colors.o: ../FL/fl_string_functions.h Fl_get_system_colors.o: ../FL/Fl_Text_Buffer.H Fl_get_system_colors.o: ../FL/Fl_Text_Display.H Fl_get_system_colors.o: ../FL/Fl_Text_Editor.H @@ -2041,7 +2041,7 @@ Fl_Help_View.o: ../FL/Fl_RGB_Image.H Fl_Help_View.o: ../FL/Fl_Scrollbar.H Fl_Help_View.o: ../FL/Fl_Shared_Image.H Fl_Help_View.o: ../FL/Fl_Slider.H -Fl_Help_View.o: ../FL/fl_string.h +Fl_Help_View.o: ../FL/fl_string_functions.h Fl_Help_View.o: ../FL/fl_types.h Fl_Help_View.o: ../FL/fl_utf8.h Fl_Help_View.o: ../FL/Fl_Valuator.H @@ -2084,7 +2084,7 @@ fl_images_core.o: ../FL/Fl_Widget.H fl_images_core.o: ../FL/platform_types.h fl_images_core.o: flstring.h Fl_Image_Reader.o: ../FL/Fl_Export.H -Fl_Image_Reader.o: ../FL/fl_string.h +Fl_Image_Reader.o: ../FL/fl_string_functions.h Fl_Image_Reader.o: ../FL/fl_types.h Fl_Image_Reader.o: ../FL/fl_utf8.h Fl_Image_Reader.o: Fl_Image_Reader.h @@ -2309,7 +2309,7 @@ Fl_Menu_add.o: ../FL/Fl_Export.H Fl_Menu_add.o: ../FL/Fl_Image.H Fl_Menu_add.o: ../FL/Fl_Menu_.H Fl_Menu_add.o: ../FL/Fl_Menu_Item.H -Fl_Menu_add.o: ../FL/fl_string.h +Fl_Menu_add.o: ../FL/fl_string_functions.h Fl_Menu_add.o: ../FL/fl_types.h Fl_Menu_add.o: ../FL/Fl_Widget.H Fl_Menu_add.o: ../FL/platform_types.h @@ -2395,8 +2395,8 @@ Fl_Message.o: ../FL/Fl_Input.H Fl_Message.o: ../FL/Fl_Input_.H Fl_Message.o: ../FL/Fl_Return_Button.H Fl_Message.o: ../FL/Fl_Secret_Input.H -Fl_Message.o: ../FL/fl_string.h Fl_Message.o: ../FL/Fl_String_class.H +Fl_Message.o: ../FL/fl_string_functions.h Fl_Message.o: ../FL/fl_types.h Fl_Message.o: ../FL/fl_utf8.h Fl_Message.o: ../FL/Fl_Widget.H @@ -2515,6 +2515,7 @@ Fl_Native_File_Chooser_GTK.o: ../FL/Fl_File_Browser.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_File_Chooser.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_File_Icon.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_File_Input.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Graphics_Driver.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Group.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Image.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Image_Surface.H @@ -2525,15 +2526,25 @@ Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Menu_.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Menu_Button.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Menu_Item.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Native_File_Chooser.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Overlay_Window.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Pixmap.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Plugin.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Preferences.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Rect.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Return_Button.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_RGB_Image.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Scrollbar.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Shared_Image.H -Fl_Native_File_Chooser_GTK.o: ../FL/fl_string.h +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Slider.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_String_class.H +Fl_Native_File_Chooser_GTK.o: ../FL/fl_string_functions.h +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Text_Buffer.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Text_Display.H +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Text_Editor.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Tile.H Fl_Native_File_Chooser_GTK.o: ../FL/fl_types.h Fl_Native_File_Chooser_GTK.o: ../FL/fl_utf8.h +Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Valuator.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Widget.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Widget_Surface.H Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Window.H @@ -2543,13 +2554,16 @@ Fl_Native_File_Chooser_GTK.o: ../FL/x11.H Fl_Native_File_Chooser_GTK.o: drivers/Posix/Fl_Posix_System_Driver.H Fl_Native_File_Chooser_GTK.o: drivers/X11/Fl_X11_System_Driver.H Fl_Native_File_Chooser_GTK.o: Fl_Native_File_Chooser_Kdialog.H +Fl_Native_File_Chooser_GTK.o: Fl_Screen_Driver.H Fl_Native_File_Chooser_GTK.o: Fl_System_Driver.H +Fl_Native_File_Chooser_GTK.o: Fl_Window_Driver.H Fl_Native_File_Chooser_Kdialog.o: ../config.h Fl_Native_File_Chooser_Kdialog.o: ../FL/Enumerations.H Fl_Native_File_Chooser_Kdialog.o: ../FL/filename.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl.H Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_ask.H Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_attr.h +Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Bitmap.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Box.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Browser.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Button.H @@ -2573,6 +2587,7 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Menu_.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Menu_Button.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Menu_Item.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Native_File_Chooser.H +Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Overlay_Window.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Preferences.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Return_Button.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_String_class.H @@ -2583,6 +2598,7 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Widget.H Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Window.H Fl_Native_File_Chooser_Kdialog.o: ../FL/platform_types.h Fl_Native_File_Chooser_Kdialog.o: Fl_Native_File_Chooser_Kdialog.H +Fl_Native_File_Chooser_Kdialog.o: Fl_Window_Driver.H fl_open_uri.o: ../config.h fl_open_uri.o: ../FL/Enumerations.H fl_open_uri.o: ../FL/filename.H @@ -2779,7 +2795,7 @@ Fl_Preferences.o: ../FL/fl_config.h Fl_Preferences.o: ../FL/Fl_Export.H Fl_Preferences.o: ../FL/Fl_Plugin.H Fl_Preferences.o: ../FL/Fl_Preferences.H -Fl_Preferences.o: ../FL/fl_string.h +Fl_Preferences.o: ../FL/fl_string_functions.h Fl_Preferences.o: ../FL/fl_types.h Fl_Preferences.o: ../FL/fl_utf8.h Fl_Preferences.o: ../FL/platform_types.h @@ -3182,7 +3198,7 @@ fl_string.o: ../FL/fl_casts.H fl_string.o: ../FL/fl_config.h fl_string.o: ../FL/Fl_Export.H fl_string.o: ../FL/Fl_Preferences.H -fl_string.o: ../FL/fl_string.h +fl_string.o: ../FL/fl_string_functions.h fl_string.o: ../FL/fl_types.h fl_string.o: ../FL/fl_utf8.h fl_string.o: ../FL/platform_types.h @@ -3208,7 +3224,7 @@ Fl_SVG_Image.o: ../FL/Fl_Rect.H Fl_SVG_Image.o: ../FL/Fl_RGB_Image.H Fl_SVG_Image.o: ../FL/Fl_Scrollbar.H Fl_SVG_Image.o: ../FL/Fl_Slider.H -Fl_SVG_Image.o: ../FL/fl_string.h +Fl_SVG_Image.o: ../FL/fl_string_functions.h Fl_SVG_Image.o: ../FL/Fl_SVG_Image.H Fl_SVG_Image.o: ../FL/Fl_Text_Buffer.H Fl_SVG_Image.o: ../FL/Fl_Text_Display.H @@ -3329,8 +3345,8 @@ Fl_Text_Buffer.o: ../FL/Fl_Cairo.H Fl_Text_Buffer.o: ../FL/fl_casts.H Fl_Text_Buffer.o: ../FL/fl_config.h Fl_Text_Buffer.o: ../FL/Fl_Export.H -Fl_Text_Buffer.o: ../FL/fl_string.h Fl_Text_Buffer.o: ../FL/Fl_String_class.H +Fl_Text_Buffer.o: ../FL/fl_string_functions.h Fl_Text_Buffer.o: ../FL/Fl_Text_Buffer.H Fl_Text_Buffer.o: ../FL/fl_types.h Fl_Text_Buffer.o: ../FL/fl_utf8.h @@ -3356,7 +3372,7 @@ Fl_Text_Display.o: ../FL/Fl_Rect.H Fl_Text_Display.o: ../FL/Fl_RGB_Image.H Fl_Text_Display.o: ../FL/Fl_Scrollbar.H Fl_Text_Display.o: ../FL/Fl_Slider.H -Fl_Text_Display.o: ../FL/fl_string.h +Fl_Text_Display.o: ../FL/fl_string_functions.h Fl_Text_Display.o: ../FL/Fl_Text_Buffer.H Fl_Text_Display.o: ../FL/Fl_Text_Display.H Fl_Text_Display.o: ../FL/Fl_Text_Editor.H @@ -3447,7 +3463,7 @@ Fl_Tooltip.o: ../FL/Fl_Export.H Fl_Tooltip.o: ../FL/Fl_Menu_Window.H Fl_Tooltip.o: ../FL/Fl_Preferences.H Fl_Tooltip.o: ../FL/Fl_Single_Window.H -Fl_Tooltip.o: ../FL/fl_string.h +Fl_Tooltip.o: ../FL/fl_string_functions.h Fl_Tooltip.o: ../FL/Fl_Tooltip.H Fl_Tooltip.o: ../FL/fl_types.h Fl_Tooltip.o: ../FL/fl_utf8.h @@ -3467,7 +3483,7 @@ Fl_Tree.o: ../FL/Fl_Image.H Fl_Tree.o: ../FL/Fl_Preferences.H Fl_Tree.o: ../FL/Fl_Scrollbar.H Fl_Tree.o: ../FL/Fl_Slider.H -Fl_Tree.o: ../FL/fl_string.h +Fl_Tree.o: ../FL/fl_string_functions.h Fl_Tree.o: ../FL/Fl_Tree.H Fl_Tree.o: ../FL/Fl_Tree_Item.H Fl_Tree.o: ../FL/Fl_Tree_Item_Array.H @@ -3488,7 +3504,7 @@ Fl_Tree_Item.o: ../FL/Fl_Group.H Fl_Tree_Item.o: ../FL/Fl_Image.H Fl_Tree_Item.o: ../FL/Fl_Scrollbar.H Fl_Tree_Item.o: ../FL/Fl_Slider.H -Fl_Tree_Item.o: ../FL/fl_string.h +Fl_Tree_Item.o: ../FL/fl_string_functions.h Fl_Tree_Item.o: ../FL/Fl_Tree.H Fl_Tree_Item.o: ../FL/Fl_Tree_Item.H Fl_Tree_Item.o: ../FL/Fl_Tree_Item_Array.H @@ -3654,7 +3670,7 @@ Fl_Widget.o: ../FL/fl_config.h Fl_Widget.o: ../FL/fl_draw.H Fl_Widget.o: ../FL/Fl_Export.H Fl_Widget.o: ../FL/Fl_Group.H -Fl_Widget.o: ../FL/fl_string.h +Fl_Widget.o: ../FL/fl_string_functions.h Fl_Widget.o: ../FL/Fl_Tooltip.H Fl_Widget.o: ../FL/fl_types.h Fl_Widget.o: ../FL/fl_utf8.h @@ -3718,7 +3734,7 @@ Fl_Window.o: ../FL/Fl_Rect.H Fl_Window.o: ../FL/Fl_RGB_Image.H Fl_Window.o: ../FL/Fl_Scrollbar.H Fl_Window.o: ../FL/Fl_Slider.H -Fl_Window.o: ../FL/fl_string.h +Fl_Window.o: ../FL/fl_string_functions.h Fl_Window.o: ../FL/Fl_Text_Buffer.H Fl_Window.o: ../FL/Fl_Text_Display.H Fl_Window.o: ../FL/Fl_Text_Editor.H @@ -3827,7 +3843,7 @@ fl_write_png.o: ../FL/Fl_Export.H fl_write_png.o: ../FL/Fl_Image.H fl_write_png.o: ../FL/Fl_PNG_Image.H fl_write_png.o: ../FL/Fl_RGB_Image.H -fl_write_png.o: ../FL/fl_string.h +fl_write_png.o: ../FL/fl_string_functions.h fl_write_png.o: ../FL/fl_types.h fl_write_png.o: ../FL/fl_utf8.h Fl_x.o: ../config.h diff --git a/src/print_panel.cxx b/src/print_panel.cxx index 7b29991fa..aa1908f35 100644 --- a/src/print_panel.cxx +++ b/src/print_panel.cxx @@ -36,7 +36,7 @@ #include "../src/flstring.h" #include <FL/Fl_Preferences.H> #include <FL/Fl_Int_Input.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> static Fl_Double_Window *print_panel=(Fl_Double_Window *)0; static Fl_Group *print_panel_controls=(Fl_Group *)0; diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index 4a2bbc990..88235245d 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -21,7 +21,7 @@ #include "../Xutf8.h" #include <X11/Xlib.h> -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include <ctype.h> #include <stdlib.h> #include <string.h> diff --git a/test/makedepend b/test/makedepend index c1d99a5fa..f5d270863 100644 --- a/test/makedepend +++ b/test/makedepend @@ -1486,8 +1486,8 @@ menubar.o: ../FL/Fl_RGB_Image.H menubar.o: ../FL/Fl_Scrollbar.H menubar.o: ../FL/Fl_Simple_Terminal.H menubar.o: ../FL/Fl_Slider.H -menubar.o: ../FL/fl_string.h menubar.o: ../FL/Fl_String_class.H +menubar.o: ../FL/fl_string_functions.h menubar.o: ../FL/Fl_Sys_Menu_Bar.H menubar.o: ../FL/Fl_Text_Buffer.H menubar.o: ../FL/Fl_Text_Display.H @@ -2513,7 +2513,7 @@ unittests.o: ../FL/Fl_Scroll.H unittests.o: ../FL/Fl_Scrollbar.H unittests.o: ../FL/Fl_Simple_Terminal.H unittests.o: ../FL/Fl_Slider.H -unittests.o: ../FL/fl_string.h +unittests.o: ../FL/fl_string_functions.h unittests.o: ../FL/Fl_Table.H unittests.o: ../FL/Fl_Tabs.H unittests.o: ../FL/Fl_Text_Buffer.H @@ -2578,7 +2578,7 @@ utf8.o: ../FL/Fl_RGB_Image.H utf8.o: ../FL/Fl_Scroll.H utf8.o: ../FL/Fl_Scrollbar.H utf8.o: ../FL/Fl_Slider.H -utf8.o: ../FL/fl_string.h +utf8.o: ../FL/fl_string_functions.h utf8.o: ../FL/Fl_Tile.H utf8.o: ../FL/fl_types.h utf8.o: ../FL/fl_utf8.h diff --git a/test/menubar.cxx b/test/menubar.cxx index 43e4961ce..1bb28baf6 100644 --- a/test/menubar.cxx +++ b/test/menubar.cxx @@ -30,7 +30,7 @@ #include <FL/fl_draw.H> #include <FL/Fl_Simple_Terminal.H> #include <FL/fl_ask.H> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #define TERMINAL_HEIGHT 120 diff --git a/test/unittests.cxx b/test/unittests.cxx index 22e6220a2..b81a007d1 100644 --- a/test/unittests.cxx +++ b/test/unittests.cxx @@ -28,7 +28,7 @@ #include <FL/Fl_Group.H> #include <FL/Fl_Box.H> #include <FL/fl_draw.H> // fl_text_extents() -#include <FL/fl_string.h> // fl_strdup() +#include <FL/fl_string_functions.h> // fl_strdup() #include <stdlib.h> // malloc, free // WINDOW/WIDGET SIZES diff --git a/test/utf8.cxx b/test/utf8.cxx index 062e4ba74..130f411fa 100644 --- a/test/utf8.cxx +++ b/test/utf8.cxx @@ -28,7 +28,7 @@ #include <FL/Fl_Output.H> #include <FL/fl_draw.H> #include <FL/fl_utf8.h> -#include <FL/fl_string.h> +#include <FL/fl_string_functions.h> #include <stdio.h> #include <stdlib.h> |