summaryrefslogtreecommitdiff
path: root/src/fl_file_dir.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2004-07-23 21:12:24 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2004-07-23 21:12:24 +0000
commit8f4fa005746deb8dd7e34cd07acaa55d50d59fe9 (patch)
tree9ebc7c07c4059fa9cb92837c7c214edf570ea64b /src/fl_file_dir.cxx
parentb33b5ffe0852d25aea386152148034723bccdc05 (diff)
Fl_Counter didn't use a thin down box for the text field if the
box type was set to FL_THIN_UP_BOX (STR #467) Fl_Help_View now resets the scrollbars if they go outside the current view (STR #464) fl_dir_chooser() did not show the previous selection as documented (STR #443) Fl_Text_Display used delete[] instead of free() in some places (STR #466) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3691 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_file_dir.cxx')
-rw-r--r--src/fl_file_dir.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fl_file_dir.cxx b/src/fl_file_dir.cxx
index 89f436f82..d0142e8c9 100644
--- a/src/fl_file_dir.cxx
+++ b/src/fl_file_dir.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_file_dir.cxx,v 1.1.2.15 2004/04/11 04:39:00 easysw Exp $"
+// "$Id: fl_file_dir.cxx,v 1.1.2.16 2004/07/23 21:12:24 easysw Exp $"
//
// File chooser widget for the Fast Light Tool Kit (FLTK).
//
@@ -114,16 +114,16 @@ fl_dir_chooser(const char *message, // I - Message for titlebar
{
static char retname[1024]; // Returned directory name
- if (!fname || !*fname) fname = ".";
-
if (!fc) {
+ if (!fname || !*fname) fname = ".";
+
fc = new Fl_File_Chooser(fname, "*", Fl_File_Chooser::CREATE |
Fl_File_Chooser::DIRECTORY, message);
fc->callback(callback, 0);
} else {
fc->type(Fl_File_Chooser::CREATE | Fl_File_Chooser::DIRECTORY);
fc->filter("*");
- fc->value(fname);
+ if (fname && *fname) fc->value(fname);
fc->label(message);
}
@@ -142,5 +142,5 @@ fl_dir_chooser(const char *message, // I - Message for titlebar
//
-// End of "$Id: fl_file_dir.cxx,v 1.1.2.15 2004/04/11 04:39:00 easysw Exp $".
+// End of "$Id: fl_file_dir.cxx,v 1.1.2.16 2004/07/23 21:12:24 easysw Exp $".
//