Fix fl_dir_chooser()/Fl_File_Chooser:value() bug - cancel didn't return

NULL since the filename field wasn't cleared, too...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2848 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 12 insertions, 10 deletions

diff --git a/CHANGES b/CHANGES
index f9cfa0f7c..75e97b92b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 CHANGES IN FLTK 1.1.2
 
+	- Fl_File_Chooser::value() didn't return NULL when the
+	  user clicked Cancel while selecting a directory.  This
+	  bug also affected fl_dir_chooser().
 	- Fl_Menu_::add(const char *) used too small a menu item
 	  label buffer and didn't do bounds checking.
 	- Eliminate some compiler warnings with CodeWarrier
diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H
index 46b31a470..b07efe85a 100644
--- a/FL/Fl_File_Chooser.H
+++ b/FL/Fl_File_Chooser.H
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0100
+// generated by Fast Light User Interface Designer (fluid) version 1.0102
 
 #ifndef Fl_File_Chooser_H
 #define Fl_File_Chooser_H
diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index 1b009cd9a..21330fb89 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0100
+// generated by Fast Light User Interface Designer (fluid) version 1.0102
 
 #include "../FL/Fl_File_Chooser.H"
 
@@ -79,7 +79,7 @@ void Fl_File_Chooser::cb_okButton(Fl_Return_Button* o, void* v) {
 }
 
 inline void Fl_File_Chooser::cb_Cancel_i(Fl_Button*, void*) {
-  fileName->value(directory_);
+  fileName->value("");
 fileList->deselect();
 Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
 window->hide();
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index f003c2804..34738e680 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0100 
+version 1.0102 
 header_name {../FL/Fl_File_Chooser.H} 
 code_name {.cxx}
 class Fl_File_Chooser {open
@@ -113,10 +113,10 @@ window->hide();}
           }
           Fl_Button {} {
             label Cancel
-            callback {fileName->value(directory_);
+            callback {fileName->value("");
 fileList->deselect();
 Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
-window->hide();}
+window->hide();} selected
             private xywh {405 345 75 25}
             code0 {o->label(fl_cancel);}
           }
@@ -128,8 +128,8 @@ window->hide();}
     }
     Fl_Window favWindow {
       label {Manage Favorites} open
-      private xywh {580 44 355 150}
-      code0 {favWindow->label(manage_favorites_label);} modal visible
+      private xywh {580 44 355 150} hide
+      code0 {favWindow->label(manage_favorites_label);} modal
     } {
       Fl_File_Browser favList {
         callback {favoritesCB(favList);}
@@ -292,8 +292,7 @@ else
 if (t & DIRECTORY)
   fileList->filetype(Fl_File_Browser::DIRECTORIES);
 else
-  fileList->filetype(Fl_File_Browser::FILES);} {selected
-    }
+  fileList->filetype(Fl_File_Browser::FILES);} {}
   }
   Function {type()} {return_type int
   } {