From 913561c63036ea747fce55b4c46655abe41d5ce3 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 28 Oct 2002 15:00:56 +0000 Subject: Fix handling of directories with \ in them. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2694 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ src/Fl_File_Chooser2.cxx | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index f1be1a54a..cf3e372a7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.2 + - Fl_File_Chooser didn't handle WIN32 home directories + that used backslashes instead of forward slashes. - Fl_Text_Display didn't limit the resize height to 1 line. - Fl_Scrollbar widgets incorrectly took keyboard focus diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index f276f4dc0..92035f05e 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.23 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.24 2002/10/28 15:00:56 easysw Exp $" // // More Fl_File_Chooser routines. // @@ -1112,10 +1112,16 @@ quote_pathname(char *dst, // O - Destination string dstsize --; while (*src && dstsize > 1) { - if (*src == '/') + if (*src == '\\') { + // Convert backslash to forward slash... *dst++ = '\\'; + *dst++ = '/'; + src ++; + } else { + if (*src == '/') *dst++ = '\\'; - *dst++ = *src++; + *dst++ = *src++; + } } *dst = '\0'; @@ -1143,5 +1149,5 @@ unquote_pathname(char *dst, // O - Destination string // -// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.23 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.24 2002/10/28 15:00:56 easysw Exp $". // -- cgit v1.2.3