]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't append extension if it contains wildcards in wxGTK wxFileDialog.
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 1 Jul 2013 14:58:27 +0000 (14:58 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 1 Jul 2013 14:58:27 +0000 (14:58 +0000)
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

index 1d13bb69dfe0359f1c4a67dbebf12eb9d9e062a6..6d36d6364e69dc33ce16030c741632522a62d5db 100644 (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;
+        }
     }