From a039ccbfc50645ad0e990ea2ceb12943baa7fd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 6 Jan 2002 14:50:55 +0000 Subject: [PATCH] 1. fixed CR/LF mess (sorry) 2. applied Dimitri's patch for foo..bar case 3. explained while my workaround for MSLU bug will have to stay here forever git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/filedlg.cpp | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 249f674d4e..4f0d03e243 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -400,10 +400,15 @@ int wxFileDialog::ShowModal() } #if wxUSE_UNICODE_MSLU && defined(OFN_EXPLORER) - // VS: these's a bug in unicows.dll - when multiple files are - // selected, of.nFileOffset doesn't point to the first - // filename but rather to the last component of directory - // name. Let's try to fix it: + // VS: there's a bug in unicows.dll - when multiple files are selected, + // of.nFileOffset doesn't point to the first filename but rather to + // the last component of directory name. This bug is known to MSLU + // developers, but they are not going to fix it: "this is a true + // limitation, that we have decided to live with" and "working + // harder on this case just did not seem worth the effort"... + // + // Our only option is to try to fix it ourselves: + if ( (m_dialogStyle & wxMULTIPLE) && (fileNameBuffer[of.nFileOffset-1] != wxT('\0')) && wxGetOsVersion() == wxWIN95 /*using unicows.dll*/) @@ -471,6 +476,17 @@ int wxFileDialog::ShowModal() { // User has typed a filename without an extension: + // A filename can end in a "." here ("abc."), this means it + // does not have an extension. Because later on a "." with + // the default extension is appended we remove the "." if + // filename ends with one (We don't want files called + // "abc..ext") + int idx = wxStrlen(fileNameBuffer) - 1; + if ( fileNameBuffer[idx] == wxT('.') ) + { + fileNameBuffer[idx] = wxT('\0'); + } + int maxFilter = (int)(of.nFilterIndex*2L-1L); extension = filterBuffer;