From 1161316c678da3df114ffed5177b31e24a076df3 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 18 Feb 2003 09:27:23 +0000 Subject: [PATCH] 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/branches/WX_2_4_BRANCH@19240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 7 +++++++ src/generic/filedlgg.cpp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index e81be5fbcf..a159d2ee6f 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -184,6 +184,13 @@ All: - Added missing wx/quantize.h to install. +wxGTK: + +- Added wxEVT_MENU_OPEN event generation. +- Fixed bug in generic file selector causing incomplete file extensions to + be appended to filenames with no extension. + + 2.4.0 ----- diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 8e8f0365c4..bcb998dbce 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -1262,8 +1262,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