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
This commit is contained in:
parent
bc0de1ee82
commit
a039ccbfc5
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user