| |
commit 92e9181a0a885b2b58e002e3a5e76152763388a2
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sun Jan 16 19:02:36 2022 +0100
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sun Jan 16 19:47:16 2022 +0100
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).
FL/fl_string.h | 47 ---------------
FL/fl_string_functions.h | 47 +++++++++++++++
fluid/ExternalCodeEditor_UNIX.cxx | 2 +-
fluid/ExternalCodeEditor_WIN32.cxx | 2 +-
fluid/Fl_Function_Type.cxx | 2 +-
fluid/Fluid_Image.cxx | 2 +-
fluid/code.cxx | 2 +-
fluid/file.cxx | 2 +-
fluid/fluid.cxx | 2 +-
fluid/makedepend | 16 ++---
fluid/print_panel.cxx | 2 +-
fluid/print_panel.fl | 2 +-
fluid/shell_command.cxx | 2 +-
fluid/template_panel.cxx | 2 +-
fluid/template_panel.fl | 2 +-
src/CMakeLists.txt | 2 +-
src/Fl_Check_Browser.cxx | 2 +-
src/Fl_File_Browser.cxx | 2 +-
src/Fl_File_Chooser2.cxx | 2 +-
src/Fl_Help_View.cxx | 2 +-
src/Fl_Image_Reader.cxx | 2 +-
src/Fl_MacOS_Sys_Menu_Bar.mm | 2 +-
src/Fl_Menu_add.cxx | 2 +-
src/Fl_Message.cxx | 2 +-
src/Fl_Native_File_Chooser_GTK.cxx | 2 +-
src/Fl_Native_File_Chooser_MAC.mm | 2 +-
src/Fl_Native_File_Chooser_WIN32.cxx | 2 +-
src/Fl_Preferences.cxx | 2 +-
src/Fl_SVG_Image.cxx | 2 +-
src/Fl_Text_Buffer.cxx | 2 +-
src/Fl_Text_Display.cxx | 2 +-
src/Fl_Tooltip.cxx | 2 +-
src/Fl_Tree.cxx | 2 +-
src/Fl_Tree_Item.cxx | 2 +-
src/Fl_Widget.cxx | 2 +-
src/Fl_Window.cxx | 2 +-
src/Fl_cocoa.mm | 2 +-
src/Fl_get_system_colors.cxx | 2 +-
src/Fl_win32.cxx | 2 +-
src/Makefile | 2 +-
src/drivers/Android/Fl_Android_Application.cxx | 2 +-
src/drivers/Android/Fl_Android_System_Driver.H | 2 +-
src/drivers/Android/Fl_Android_System_Driver.cxx | 2 +-
src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm | 2 +-
src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx | 2 +-
src/drivers/Posix/Fl_Posix_System_Driver.cxx | 2 +-
src/drivers/PostScript/Fl_PostScript.cxx | 2 +-
.../Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 2 +-
src/drivers/SVG/Fl_SVG_File_Surface.cxx | 2 +-
src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 2 +-
src/drivers/X11/Fl_X11_System_Driver.cxx | 2 +-
.../Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx | 2 +-
.../Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx | 2 +-
src/filename_absolute.cxx | 2 +-
src/fl_string.cxx | 34 -----------
src/fl_string_functions.cxx | 34 +++++++++++
src/fl_write_png.cxx | 2 +-
src/makedepend | 70 +++++++++++++---------
src/print_panel.cxx | 2 +-
src/xutf8/utf8Wrap.c | 2 +-
test/makedepend | 6 +-
test/menubar.cxx | 2 +-
test/unittests.cxx | 2 +-
test/utf8.cxx | 2 +-
64 files changed, 192 insertions(+), 176 deletions(-)
diff --git FL/fl_string.h FL/fl_string.h
deleted file mode 100644
index adcefa4..0000000
--- FL/fl_string.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Platform agnostic string portability functions for the Fast Light Tool Kit (FLTK).
- *
- * Copyright 2020 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
- * file is missing or damaged, see the license at:
- *
- * https://www.fltk.org/COPYING.php
- *
- * Please see the following page on how to report bugs and issues:
- *
- * https://www.fltk.org/bugs.php
- */
-
-/**
- \file fl_string.h
- \brief Public header for FLTK's own platform agnostic string handling.
-*/
-
-#ifndef _FL_fl_string_h_
-#define _FL_fl_string_h_
-
-#include "Fl_Export.H"
-#include "fl_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \addtogroup fl_string
- @{
-*/
-
-FL_EXPORT char* fl_strdup(const char *s);
-
-/** @} */
-
-/*****************************************************************************/
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* _FL_fl_string_h_ */
diff --git FL/fl_string_functions.h FL/fl_string_functions.h
new file mode 100644
index 0000000..2e7d0e9
--- /dev/null
+++ FL/fl_string_functions.h
@@ -0,0 +1,47 @@
+/*
+ * Platform agnostic string portability functions for the Fast Light Tool Kit (FLTK).
+ *
+ * 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
+ * file is missing or damaged, see the license at:
+ *
+ * https://www.fltk.org/COPYING.php
+ *
+ * Please see the following page on how to report bugs and issues:
+ *
+ * https://www.fltk.org/bugs.php
+ */
+
+/**
+ \file fl_string_functions.h
+ \brief Public header for FLTK's own platform agnostic string handling.
+*/
+
+#ifndef _FL_fl_string_functions_h_
+#define _FL_fl_string_functions_h_
+
+#include "Fl_Export.H"
+#include "fl_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \addtogroup fl_string
+ @{
+*/
+
+FL_EXPORT char* fl_strdup(const char *s);
+
+/** @} */
+
+/*****************************************************************************/
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* _FL_fl_string_functions_h_ */
diff --git fluid/ExternalCodeEditor_UNIX.cxx fluid/ExternalCodeEditor_UNIX.cxx
index 8ff27d0..e7c79d9 100644
--- fluid/ExternalCodeEditor_UNIX.cxx
+++ 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 fluid/ExternalCodeEditor_WIN32.cxx fluid/ExternalCodeEditor_WIN32.cxx
index a137b3e..5536947 100644
--- fluid/ExternalCodeEditor_WIN32.cxx
+++ 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 fluid/Fl_Function_Type.cxx fluid/Fl_Function_Type.cxx
index a4ab673..3c72886 100644
--- fluid/Fl_Function_Type.cxx
+++ 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 fluid/Fluid_Image.cxx fluid/Fluid_Image.cxx
index a63355a..58f5b8d 100644
--- fluid/Fluid_Image.cxx
+++ 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 fluid/code.cxx fluid/code.cxx
index 7de06ea..ba57ae8 100644
--- fluid/code.cxx
+++ 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 fluid/file.cxx fluid/file.cxx
index 0e6fbe4..39768ea 100644
--- fluid/file.cxx
+++ 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 fluid/fluid.cxx fluid/fluid.cxx
index 95568d6..1ed1ad9 100644
--- fluid/fluid.cxx
+++ 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 fluid/makedepend fluid/makedepend
index d9f4a0d..ad6d185 100644
--- fluid/makedepend
+++ 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 fluid/print_panel.cxx fluid/print_panel.cxx
index 0d688d4..3633c8a 100644
--- fluid/print_panel.cxx
+++ 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 fluid/print_panel.fl fluid/print_panel.fl
index 48cb43e..e85f349 100644
--- fluid/print_panel.fl
+++ 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 fluid/shell_command.cxx fluid/shell_command.cxx
index 1475259..630b84b 100644
--- fluid/shell_command.cxx
+++ 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 fluid/template_panel.cxx fluid/template_panel.cxx
index 0c4db0d..b23bc96 100644
--- fluid/template_panel.cxx
+++ 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 fluid/template_panel.fl fluid/template_panel.fl
index 9407a75..7b5f9b1 100644
--- fluid/template_panel.fl
+++ 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 src/CMakeLists.txt src/CMakeLists.txt
index a86f5ce..d11dc1f 100644
--- src/CMakeLists.txt
+++ 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 src/Fl_Check_Browser.cxx src/Fl_Check_Browser.cxx
index a05c4e4..d831c3c 100644
--- src/Fl_Check_Browser.cxx
+++ 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 src/Fl_File_Browser.cxx src/Fl_File_Browser.cxx
index da70c87..e3a70aa 100644
--- src/Fl_File_Browser.cxx
+++ 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 src/Fl_File_Chooser2.cxx src/Fl_File_Chooser2.cxx
index 363adf7..ca17df1 100644
--- src/Fl_File_Chooser2.cxx
+++ 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 src/Fl_Help_View.cxx src/Fl_Help_View.cxx
index 7f7c8e2..3ccafc2 100644
--- src/Fl_Help_View.cxx
+++ 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 src/Fl_Image_Reader.cxx src/Fl_Image_Reader.cxx
index e15d343..a3cc3f3 100644
--- src/Fl_Image_Reader.cxx
+++ 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 src/Fl_MacOS_Sys_Menu_Bar.mm src/Fl_MacOS_Sys_Menu_Bar.mm
index e529f07..3320d0f 100644
--- src/Fl_MacOS_Sys_Menu_Bar.mm
+++ 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 src/Fl_Menu_add.cxx src/Fl_Menu_add.cxx
index 5231e88..cd6bde4 100644
--- src/Fl_Menu_add.cxx
+++ 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 src/Fl_Message.cxx src/Fl_Message.cxx
index 8a44418..5c27d2f 100644
--- src/Fl_Message.cxx
+++ 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 src/Fl_Native_File_Chooser_GTK.cxx src/Fl_Native_File_Chooser_GTK.cxx
index bfb3dbe..b422dc7 100644
--- src/Fl_Native_File_Chooser_GTK.cxx
+++ 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 src/Fl_Native_File_Chooser_MAC.mm src/Fl_Native_File_Chooser_MAC.mm
index 9c4b8b8..ae0072f 100644
--- src/Fl_Native_File_Chooser_MAC.mm
+++ 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 src/Fl_Native_File_Chooser_WIN32.cxx src/Fl_Native_File_Chooser_WIN32.cxx
index 71d98f0..53e10de 100644
--- src/Fl_Native_File_Chooser_WIN32.cxx
+++ 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 src/Fl_Preferences.cxx src/Fl_Preferences.cxx
index 4b14fe3..0ac1c17 100644
--- src/Fl_Preferences.cxx
+++ 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 src/Fl_SVG_Image.cxx src/Fl_SVG_Image.cxx
index 7436bde..57839bf 100644
--- src/Fl_SVG_Image.cxx
+++ 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 src/Fl_Text_Buffer.cxx src/Fl_Text_Buffer.cxx
index 476f1ec..4104929 100644
--- src/Fl_Text_Buffer.cxx
+++ 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 src/Fl_Text_Display.cxx src/Fl_Text_Display.cxx
index faeafc0..6612595 100644
--- src/Fl_Text_Display.cxx
+++ 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 src/Fl_Tooltip.cxx src/Fl_Tooltip.cxx
index 2d2eb20..35898dc 100644
--- src/Fl_Tooltip.cxx
+++ 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 src/Fl_Tree.cxx src/Fl_Tree.cxx
index 5dab99c..1f808ca 100644
--- src/Fl_Tree.cxx
+++ 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 src/Fl_Tree_Item.cxx src/Fl_Tree_Item.cxx
index da66a21..d9b94d2 100644
--- src/Fl_Tree_Item.cxx
+++ 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 src/Fl_Widget.cxx src/Fl_Widget.cxx
index 16bf7bc..185e99b 100644
--- src/Fl_Widget.cxx
+++ 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 src/Fl_Window.cxx src/Fl_Window.cxx
index 063a8b0..77090dc 100644
--- src/Fl_Window.cxx
+++ 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 src/Fl_cocoa.mm src/Fl_cocoa.mm
index 6da31ad..0b8fc34 100644
--- src/Fl_cocoa.mm
+++ 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 src/Fl_get_system_colors.cxx src/Fl_get_system_colors.cxx
index 73388c8..7f049f6 100644
--- src/Fl_get_system_colors.cxx
+++ 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 src/Fl_win32.cxx src/Fl_win32.cxx
index 20fc5ea..5ee2fe4 100644
--- src/Fl_win32.cxx
+++ 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 src/Makefile src/Makefile
index 47c0615..6c0b1e6 100644
--- src/Makefile
+++ 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 src/drivers/Android/Fl_Android_Application.cxx src/drivers/Android/Fl_Android_Application.cxx
index 793ebb5..32feee1 100644
--- src/drivers/Android/Fl_Android_Application.cxx
+++ 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 src/drivers/Android/Fl_Android_System_Driver.H src/drivers/Android/Fl_Android_System_Driver.H
index 5e6dafb..585535d 100644
--- src/drivers/Android/Fl_Android_System_Driver.H
+++ 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 src/drivers/Android/Fl_Android_System_Driver.cxx src/drivers/Android/Fl_Android_System_Driver.cxx
index 5c8b453..f164a7c 100644
--- src/drivers/Android/Fl_Android_System_Driver.cxx
+++ 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 src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
index 1f7511c..0637d1b 100644
--- src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
+++ 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 src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
index 140ddae..2315c87 100644
--- src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx
+++ 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 src/drivers/Posix/Fl_Posix_System_Driver.cxx src/drivers/Posix/Fl_Posix_System_Driver.cxx
index b1a3023..d64a8fd 100644
--- src/drivers/Posix/Fl_Posix_System_Driver.cxx
+++ 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 src/drivers/PostScript/Fl_PostScript.cxx src/drivers/PostScript/Fl_PostScript.cxx
index 11d61e4..38407d5 100644
--- src/drivers/PostScript/Fl_PostScript.cxx
+++ 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 src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
index 335e028..b89e359 100644
--- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
+++ 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 src/drivers/SVG/Fl_SVG_File_Surface.cxx src/drivers/SVG/Fl_SVG_File_Surface.cxx
index 371e618..701289a 100644
--- src/drivers/SVG/Fl_SVG_File_Surface.cxx
+++ 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 src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
index 61e18d9..a869b8c 100644
--- src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
+++ 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 src/drivers/X11/Fl_X11_System_Driver.cxx src/drivers/X11/Fl_X11_System_Driver.cxx
index 7868ae3..fcd1d2d 100644
--- src/drivers/X11/Fl_X11_System_Driver.cxx
+++ 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 src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx
index 9251eaf..30e31b2 100644
--- src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx
+++ 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 src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
index 66a139e..5e27c71 100644
--- src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+++ 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 src/filename_absolute.cxx src/filename_absolute.cxx
index e39da32..4e4e8ff 100644
--- src/filename_absolute.cxx
+++ 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 src/fl_string.cxx src/fl_string.cxx
deleted file mode 100644
index c53c0e2..0000000
--- src/fl_string.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Platform agnostic string portability functions for the Fast Light Tool Kit (FLTK).
- *
- * Copyright 2020 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
- * file is missing or damaged, see the license at:
- *
- * https://www.fltk.org/COPYING.php
- *
- * Please see the following page on how to report bugs and issues:
- *
- * https://www.fltk.org/bugs.php
- */
-
-#include <FL/fl_string.h>
-#include <string.h> // strdup/_strdup
-#include "Fl_System_Driver.H"
-
-/**
- Cross platform interface to POSIX function strdup().
-
- The fl_strdup() function returns a pointer to a new string which is
- a duplicate of the string 's'. Memory for the new string is obtained
- with malloc(3), and can be freed with free(3).
-
- Implementation:
- - POSIX: strdup()
- - WinAPI: _strdup()
- */
-char *fl_strdup(const char *s) {
- return Fl::system_driver()->strdup(s);
-}
diff --git src/fl_string_functions.cxx src/fl_string_functions.cxx
new file mode 100644
index 0000000..6b7fcea
--- /dev/null
+++ src/fl_string_functions.cxx
@@ -0,0 +1,34 @@
+/*
+ * Platform agnostic string portability functions for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 2020 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
+ * file is missing or damaged, see the license at:
+ *
+ * https://www.fltk.org/COPYING.php
+ *
+ * Please see the following page on how to report bugs and issues:
+ *
+ * https://www.fltk.org/bugs.php
+ */
+
+#include <FL/fl_string_functions.h>
+#include <string.h> // strdup/_strdup
+#include "Fl_System_Driver.H"
+
+/**
+ Cross platform interface to POSIX function strdup().
+
+ The fl_strdup() function returns a pointer to a new string which is
+ a duplicate of the string 's'. Memory for the new string is obtained
+ with malloc(3), and can be freed with free(3).
+
+ Implementation:
+ - POSIX: strdup()
+ - WinAPI: _strdup()
+ */
+char *fl_strdup(const char *s) {
+ return Fl::system_driver()->strdup(s);
+}
diff --git src/fl_write_png.cxx src/fl_write_png.cxx
index 6d9c7fe..0f98047 100644
--- src/fl_write_png.cxx
+++ 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 src/makedepend src/makedepend
index 1c9903d..75ab4c5 100644
--- src/makedepend
+++ 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 src/print_panel.cxx src/print_panel.cxx
index 7b29991..aa1908f 100644
--- src/print_panel.cxx
+++ 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 src/xutf8/utf8Wrap.c src/xutf8/utf8Wrap.c
index 4a2bbc9..8823524 100644
--- src/xutf8/utf8Wrap.c
+++ 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 test/makedepend test/makedepend
index c1d99a5..f5d2708 100644
--- test/makedepend
+++ 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 test/menubar.cxx test/menubar.cxx
index 43e4961..1bb28ba 100644
--- test/menubar.cxx
+++ 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 test/unittests.cxx test/unittests.cxx
index 22e6220..b81a007 100644
--- test/unittests.cxx
+++ 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 test/utf8.cxx test/utf8.cxx
index 062e4ba..130f411 100644
--- test/utf8.cxx
+++ 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>
[ Direct Link to Message ] | |
