From 13005b2a3f0f16579522523460a82dca48e855a4 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 4 May 2003 21:45:46 +0000 Subject: Fl_File_Browser incorrectly included "." on WIN32 (STR #9) Include shellapi.h instead of ShellAPI.h in the WIN32 drag-n-drop code in order to work with the MingW cross compiler (STR #6) The cursor was not properly restored when doing drag-n-drop on X11 (STR #4) Fl::remove_fd() didn't recalculate the highest file descriptor properly (STR #20) Fl_Preferences::deleteGroup() didn't work properly (STR #13) Fixed the fl_show_file_selector() function - it was copying using the wrong string size (STR #14) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_File_Browser.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/Fl_File_Browser.cxx') diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index 6bee7a25b..6052fa99d 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Browser.cxx,v 1.1.2.25 2003/01/30 21:41:41 easysw Exp $" +// "$Id: Fl_File_Browser.cxx,v 1.1.2.26 2003/05/04 21:45:45 easysw Exp $" // // Fl_File_Browser routines. // @@ -582,12 +582,8 @@ Fl_File_Browser::load(const char *directory,// I - Directory to load for (i = 0, num_dirs = 0; i < num_files; i ++) { -#if 0 - if (strcmp(files[i]->d_name, ".") != 0 && - strcmp(files[i]->d_name, "..") != 0) -#else - if (strcmp(files[i]->d_name, ".") != 0) -#endif // 0 + if (strcmp(files[i]->d_name, ".") && + strcmp(files[i]->d_name, "./")) { snprintf(filename, sizeof(filename), "%s/%s", directory_, files[i]->d_name); @@ -643,5 +639,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string // -// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.25 2003/01/30 21:41:41 easysw Exp $". +// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.26 2003/05/04 21:45:45 easysw Exp $". // -- cgit v1.2.3