Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxParseWildcard added instead of methods hidden under wxUSE_FILEDLG and wxUSE_DIRDLG.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-15 15:25:33 +00:00
parent f5f3247dcc
commit 9e152a5578
9 changed files with 90 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/dirctrlg.cpp
View File

@@ -47,7 +47,6 @@
#include "wx/mimetype.h"
#include "wx/image.h"
#include "wx/choice.h"
#include "wx/filedlg.h" // for wxFileDialogBase::ParseWildcard
#if wxUSE_STATLINE
#include "wx/statline.h"
@@ -1132,7 +1131,7 @@ void wxGenericDirCtrl::SetFilter(const wxString& filter)
bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description)
{
wxArrayString filters, descriptions;
int count = ParseFilter(filterStr, filters, descriptions);
int count = wxParseWildcard(filterStr, filters, descriptions);
if (count > 0 && n < count)
{
filter = filters[n];
@@ -1143,14 +1142,15 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
return FALSE;
}
#if WXWIN_COMPATIBILITY_2_4
// Parses the global filter, returning the number of filters.
// Returns 0 if none or if there's a problem.
// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
{
return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );
return wxParseWildcard(filterStr, descriptions, filters );
}
#endif // WXWIN_COMPATIBILITY_2_4
void wxGenericDirCtrl::DoResize()
{
@@ -1252,7 +1252,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
{
Clear();
wxArrayString descriptions, filters;
size_t n = (size_t) m_dirCtrl->ParseFilter(filter, filters, descriptions);
size_t n = (size_t) wxParseWildcard(filter, filters, descriptions);
if (n > 0 && defaultFilter < (int) n)
{