Applied patch [ 686843 ] File Dialog Wildcard Bug

A bug was introduced in generic/src/filedlgg.cpp
between versions 2.2.9 and 2.4 that causes incomplete
file extensions to be appended to filenames not having
extensions after a user changes the wildcard index in
the filedialog. This patch reverts back to the correct
code.

Bob Downey

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 2a9423d6fce2cc957c162a5413592e6004028a95..1559d0eaaa27b7c03f94cff01db6bd5d46e82bf7 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -71,6 +71,9 @@ wxGTK:
 - made wxTextCtrl::EmulateKeyPress() work for Delete and Backspace
 - fixed wxTopLevelWindow::ShowFullScreen to work with kwin, IceWM and
   window managers that support _NET_WM_STATE_FULLSCREEN
+- Added wxEVT_MENU_OPEN event generation.
+- Fixed bug in generic file selector causing incomplete file extensions to
+  be appended to filenames with no extension.
 
 wxMSW:
 

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index a1b704fcd5183cc410220ab7eda61472a5f96977..611fcf0a0424523f99644e29f90060e7e970e7d5 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1239,8 +1239,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