From 27a92e3a7e2ca5be902cf69e58257e5bdcf5fcdd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 1 Jul 2013 14:58:27 +0000 Subject: [PATCH 1/1] Don't append extension if it contains wildcards in wxGTK wxFileDialog. 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 --- src/gtk/filedlg.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 1d13bb69df..6d36d6364e 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -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; + } } -- 2.45.2