summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--src/Fl_File_Chooser2.cxx7
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index dbdebf926..16ea237dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.0
+ - Fixed a filename completion bug when changing
+ directories.
- Fl_File_Chooser::value() would return directories with
a trailing slash, but would not accept a directory
without a trailing slash.
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index b09ae539a..6109544b5 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.19 2002/07/14 18:18:59 easysw Exp $"
+// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.20 2002/07/14 18:26:54 easysw Exp $"
//
// More Fl_File_Chooser routines.
//
@@ -538,6 +538,9 @@ Fl_File_Chooser::fileNameCB()
directory(pathname);
+ snprintf(pathname, sizeof(pathname), "%s/%s", directory_, filename);
+ fileName->value(pathname);
+
fileName->position(p, m);
}
}
@@ -1135,5 +1138,5 @@ unquote_pathname(char *dst, // O - Destination string
//
-// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.19 2002/07/14 18:18:59 easysw Exp $".
+// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.20 2002/07/14 18:26:54 easysw Exp $".
//