From b010bc55c4ed22e8cbede27d5fe56b0ea843aef2 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 2 May 2002 15:24:34 +0000 Subject: Add sort function to file chooser. Document sort function and label strings for chooser. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2179 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_File_Chooser.cxx | 3 +++ src/Fl_File_Chooser.fl | 4 +++- src/Fl_File_Chooser2.cxx | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index eaebca5bf..932690caf 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -265,3 +265,6 @@ int Fl_File_Chooser::type() { int Fl_File_Chooser::visible() { return window->visible(); } +FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relative=0); +FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0); +FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*)); diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 56f9175c9..6be09a616 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -215,12 +215,14 @@ else } decl {static const char *filter_label;} {public } + decl {static Fl_File_Sort_F *sort;} {selected public + } } decl {FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relative=0);} {public } -decl {FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0);} {selected public +decl {FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0);} {public } decl {FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*));} {public diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index 9a08dbb01..f3efbdcb0 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.11 2002/05/01 12:41:21 easysw Exp $" +// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.12 2002/05/02 15:24:34 easysw Exp $" // // More Fl_File_Chooser routines. // @@ -68,6 +68,7 @@ const char *Fl_File_Chooser::directory_label = "Directory:"; const char *Fl_File_Chooser::filename_label = "Filename:"; const char *Fl_File_Chooser::filter_label = "New Filter?"; +Fl_File_Sort_F *Fl_File_Chooser::sort = fl_numericsort; // @@ -427,7 +428,7 @@ Fl_File_Chooser::rescan() okButton->deactivate(); // Build the file list... - fileList->load(directory_); + fileList->load(directory_, sort); } @@ -701,5 +702,5 @@ Fl_File_Chooser::fileNameCB() // -// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.11 2002/05/01 12:41:21 easysw Exp $". +// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.12 2002/05/02 15:24:34 easysw Exp $". // -- cgit v1.2.3