{
msw_flags |= OFN_NOCHANGEDIR;
}
-
+/* chris elliott for some reason this does not work usefully if no extension
+ is given, as it test for junk instead of junk.ext
if ( m_dialogStyle & wxOVERWRITE_PROMPT )
{
msw_flags |= OFN_OVERWRITEPROMPT;
}
-
+*/
OPENFILENAME of;
wxZeroMemory(of);
if ( chNext != _T('\\') && chNext != _T('/') )
break;
- // ignore the next one
- i++;
+ // ignore the next one, unless it is at the start of a UNC path
+ if (i > 0)
+ i++;
+ else
+ break;
}
// fall through
: (GetOpenFileName(&of) != 0);
}
}
-
-#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:
- if ( (m_dialogStyle & wxMULTIPLE) &&
- (fileNameBuffer[of.nFileOffset-1] != wxT('\0')) &&
- wxGetOsVersion() == wxWIN95 /*using unicows.dll*/)
- {
- if ( wxDirExists(fileNameBuffer) )
- {
- // 1st component is dir => multiple files selected
- of.nFileOffset = wxStrlen(fileNameBuffer)+1;
- }
- }
-#endif // wxUSE_UNICODE_MSLU
-
#endif // __WIN32__
if ( success )
{
// 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;
m_fileNames.Add(m_fileName);
m_dir = wxPathOnly(fileNameBuffer);
}
+ //=== Simulating the wxOVERWRITE_PROMPT >>============================
+ //should we also test for file save style ??
+ if ( (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+ ::wxFileExists( fileNameBuffer ) )
+ {
+ wxString messageText;
+ messageText.Printf(_("File '%s' already exists.\nDo you want to replace it?"), fileNameBuffer);
+ if ( wxMessageBox(messageText, wxT("Save File As"), wxYES_NO | wxICON_EXCLAMATION ) != wxYES )
+ {
+ success = FALSE;
+ }
+ }
}
else
{