From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 21 Jan 2004 13:41:12 +0000 (+0000)
Subject: Filter index wasn't being set for multiple file dialog
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f0f4301209cc58eb5562be289f49bf0fb9e7d6b8

Filter index wasn't being set for multiple file dialog
Added several filters to multiple files test in dialogs sample
to test that it's now working


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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 493a89b5aa..96d05b980d 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -518,8 +518,14 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 {
+    wxString wildcards = 
+#ifdef __WXMOTIF__
+                    _T("C++ files (*.cpp)|*.cpp");
+#else
+                    _T("All files (*.*)|*.*|C++ files (*.h;*.cpp)|*.h;*.cpp");
+#endif
     wxFileDialog dialog(this, _T("Testing open multiple file dialog"),
-                        _T(""), _T(""), wxFileSelectorDefaultWildcardStr,
+                        _T(""), _T(""), wildcards,
                         wxMULTIPLE);
 
     if (dialog.ShowModal() == wxID_OK)
@@ -538,6 +544,8 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 
             msg += s;
         }
+        s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex());
+        msg += s;
 
         wxMessageDialog dialog2(this, msg, _T("Selected files"));
         dialog2.ShowModal();
diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 8677731279..b8d7c947e5 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -340,6 +340,7 @@ int wxFileDialog::ShowModal()
                 dir += _T('\\');
 
             m_path = dir + m_fileName;
+            m_filterIndex = (int)of.nFilterIndex - 1;
         }
         else
         {