Add wxWindowPtr smart pointer.

[wxWidgets.git] / src / gtk / filedlg.cpp

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 1d13bb69dfe0359f1c4a67dbebf12eb9d9e062a6..ce41843b03e199d5039cee24fe11e6dab0882cc6 100644 (file)
--- 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // 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() )
         // 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;
+        }

     }
 
 
     }