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

fixed bug with parsing filter string without description

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-06-15 20:13:20 +00:00
parent 5447d1b493
commit 817670e454
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/fldlgcmn.cpp
View File

@ -244,34 +244,48 @@ int wxParseFileFilter(const wxString& filterStr,
wxArrayString& descriptions,
wxArrayString& filters)
{
descriptions.Clear();
filters.Clear();
wxString str(filterStr);
wxString description, filter;
int pos = -1;
bool finished = FALSE;
do
for ( int pos = 0; pos != wxNOT_FOUND; )
{
pos = str.Find(wxT('|'));
if (pos == -1)
return 0; // Problem
if ( pos == wxNOT_FOUND )
{
// if there are no '|'s at all in the string just take the entire
// string as filter
if ( filters.IsEmpty() )
{
description.Add(wxEmptyString);
filters.Add(filterStr);
}
else
{
wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
}
break;
}
description = str.Left(pos);
str = str.Mid(pos+1);
str = str.Mid(pos + 1);
pos = str.Find(wxT('|'));
if (pos == -1)
if ( pos == wxNOT_FOUND )
{
filter = str;
finished = TRUE;
}
else
{
filter = str.Left(pos);
str = str.Mid(pos+1);
str = str.Mid(pos + 1);
}
descriptions.Add(description);
filters.Add(filter);
}
while (!finished);
return filters.GetCount();
}