X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42ed9de2921e8c8d2c7f3ab04ce1713b4f975e6f..c80d4c1e207b0011db61cb2ce1cc8babe8e54582:/src/gtk/filedlg.cpp?ds=sidebyside

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 1d13bb69df..ce41843b03 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/filedlg.cpp
 // Purpose:     native implementation of wxFileDialog
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -272,7 +271,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;
+        }
     }