fix Alt-letter navigation with spin controls (bug 672974)

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index a1b704fcd5183cc410220ab7eda61472a5f96977..de203552250f84bcdcde357f9351a2633f3607c1 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -56,6 +56,7 @@
 #include "wx/dir.h"
 #include "wx/artprov.h"
 #include "wx/hash.h"
+#include "wx/file.h"        // for wxS_IXXX constants only
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
@@ -1222,6 +1223,12 @@ wxFileDialog::~wxFileDialog()
         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
                                ms_lastShowHidden);
     }
+
+    const int count = m_choice->GetCount();
+    for ( int i = 0; i < count; i++ )
+    {
+        delete (wxString *)m_choice->GetClientData(i);
+    }
 }
 
 int wxFileDialog::ShowModal()
@@ -1239,8 +1246,8 @@ void wxFileDialog::DoSetFilterIndex(int filterindex)
     m_filterIndex = filterindex;
     if ( str->Left(2) == wxT("*.") )
     {
-        m_filterExtension = str->Mid(2);
-        if (m_filterExtension == _T("*"))
+        m_filterExtension = str->Mid(1);
+        if (m_filterExtension == _T(".*"))
             m_filterExtension.clear();
     }
     else