AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't append extension if it contains wildcards in wxGTK wxFileDialog.

Browse Source 
Restore the test for wildcards erroneously removed in r74307.

Closes #15285.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-07-01 14:58:27 +00:00
parent 1b7f2c727d
commit 27a92e3a7e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/filedlg.cpp
View File

@ -272,7 +272,14 @@ bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
// won't do it for us by default (unlike e.g. MSW)
const wxFileName fnWC(m_fc.GetCurrentWildCard());
if ( fnWC.HasExt() )
defaultFileNameWithExt << "." << fnWC.GetExt();
{
// Notice that we shouldn't append the extension if it's a wildcard
// because this is not useful: the user would need to change it to use
// some fixed extension anyhow.
const wxString& ext = fnWC.GetExt();
if ( ext.find_first_of("?*") == wxString::npos )
defaultFileNameWithExt << "." << ext;
}
}