Now dot_special argument in wxMatchWild() is honoured. :-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a4876ea44c
commit
b112d15289
@ -1397,11 +1397,13 @@ bool wxIsWild( const wxString& pattern )
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
||||||
#ifdef HAVE_FNMATCH_H
|
#ifdef HAVE_FNMATCH_H
|
||||||
{
|
{
|
||||||
// dot_special: what is it supposed to do?
|
if(dot_special)
|
||||||
return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
|
return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
|
||||||
|
else
|
||||||
|
return fnmatch(pat.c_str(), text.c_str(), 0) == 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
||||||
@ -1409,7 +1411,6 @@ bool wxIsWild( const wxString& pattern )
|
|||||||
/*
|
/*
|
||||||
* WARNING: this code is broken!
|
* WARNING: this code is broken!
|
||||||
*/
|
*/
|
||||||
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
|
||||||
{
|
{
|
||||||
wxString tmp1 = pat;
|
wxString tmp1 = pat;
|
||||||
char *pattern = WXSTRINGCAST(tmp1);
|
char *pattern = WXSTRINGCAST(tmp1);
|
||||||
|
Loading…
Reference in New Issue
Block a user