]> git.saurik.com Git - wxWidgets.git/commitdiff
Set wild card in the base class too in wxGTK wxFileDialog.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 22 May 2010 12:07:54 +0000 (12:07 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 22 May 2010 12:07:54 +0000 (12:07 +0000)
Calling wxFileDialogBase::SetWildcard() ensures that GetWildcard() returns the
correct value after wxFileDialog::SetWildcard() was called.

The new code will also work correctly if we change SetWildcard() to handle
empty wildcard as the default one (see #12079).

Closes #12080.

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

src/gtk/filedlg.cpp

index 278950e6ab332db825c52ab3ba05e2909888b9f8..cff12d8f6fb3ea14e8bc8abb5500b5a9331d2266 100644 (file)
@@ -433,12 +433,12 @@ wxString wxFileDialog::GetFilename() const
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
-    m_fc.SetWildcard( wildCard );
+    wxFileDialogBase::SetWildcard(wildCard);
+    m_fc.SetWildcard( GetWildcard() );
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
-
     m_fc.SetFilterIndex( filterIndex);
 }
 
     m_fc.SetFilterIndex( filterIndex);
 }