From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Apr 2004 16:11:23 +0000 (+0000)
Subject: fixed wild card string construction when description is not provided and when it... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d59eea2639501cdb31a5d79c69e387ca3817d3da?ds=inline

fixed wild card string construction when description is not provided and when it is the default (*.* or *) one


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 5cfd58f897..c9d8e15494 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -52,7 +52,7 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
     m_dialogStyle = style;
     m_filterIndex = 0;
 
-    if ( wildCard.empty() )
+    if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
     {
         m_wildCard = wxString::Format(_("All files (%s)|%s"),
                                       wxFileSelectorDefaultWildcardStr,
@@ -72,9 +72,9 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
             m_wildCard = wxString::Format
                          (
                             _("%s files (%s)|%s"),
-                            m_wildCard.c_str() + nDot,
-                            m_wildCard.c_str(),
-                            m_wildCard.c_str()
+                            wildCard.c_str() + nDot,
+                            wildCard.c_str(),
+                            wildCard.c_str()
                          );
         }
     }