reverted strange and IMO unnecessary OFN_OVERWRITEPROMPT emulation (bug 812346)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2b2a5a8cbe
commit
ac95e67140
@ -157,13 +157,12 @@ int wxFileDialog::ShowModal()
|
|||||||
{
|
{
|
||||||
msw_flags |= OFN_NOCHANGEDIR;
|
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 )
|
if ( m_dialogStyle & wxOVERWRITE_PROMPT )
|
||||||
{
|
{
|
||||||
msw_flags |= OFN_OVERWRITEPROMPT;
|
msw_flags |= OFN_OVERWRITEPROMPT;
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
OPENFILENAME of;
|
OPENFILENAME of;
|
||||||
wxZeroMemory(of);
|
wxZeroMemory(of);
|
||||||
|
|
||||||
@ -368,18 +367,6 @@ int wxFileDialog::ShowModal()
|
|||||||
m_fileNames.Add(m_fileName);
|
m_fileNames.Add(m_fileName);
|
||||||
m_dir = wxPathOnly(fileNameBuffer);
|
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, _("Save File As"), wxYES_NO | wxICON_EXCLAMATION ) != wxYES )
|
|
||||||
{
|
|
||||||
success = FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user