summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--src/filename_absolute.cxx3
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 171c723bb..604dad36e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745)
+ - filename_relative() now converts the current directory
+ to forward slashes as needed on WIN32 (STR #816)
- Fl_File_Chooser::value() and ::directory() now handle
paths with backslashes on WIN32 (STR #811)
- Added the standard rgb.txt file from X11 to the test
diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx
index eda86d94b..6ffc6df39 100644
--- a/src/filename_absolute.cxx
+++ b/src/filename_absolute.cxx
@@ -134,6 +134,9 @@ fl_filename_relative(char *to, // O - Relative filename
}
#if defined(WIN32) || defined(__EMX__)
+ for (slash = strchr(cwd, '\\'); slash; slash = strchr(slash + 1, '\\'))
+ *slash = '/';
+
if (!strcasecmp(from, cwd)) {
strlcpy(to, ".", tolen);
return (1);