test for HAVE_FNMATCH, not HAVE_FNMATCH_H
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1698,7 +1698,7 @@ bool wxIsWild( const wxString& pattern )
|
|||||||
|
|
||||||
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
||||||
|
|
||||||
#if defined(HAVE_FNMATCH_H)
|
#ifdef HAVE_FNMATCH
|
||||||
{
|
{
|
||||||
// this probably won't work well for multibyte chars in Unicode mode?
|
// this probably won't work well for multibyte chars in Unicode mode?
|
||||||
if(dot_special)
|
if(dot_special)
|
||||||
@@ -1706,7 +1706,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
|||||||
else
|
else
|
||||||
return fnmatch(pat.fn_str(), text.fn_str(), 0) == 0;
|
return fnmatch(pat.fn_str(), text.fn_str(), 0) == 0;
|
||||||
}
|
}
|
||||||
#else
|
#else // !HAVE_FNMATCH
|
||||||
|
|
||||||
// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
|
// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
|
||||||
|
|
||||||
@@ -1847,7 +1847,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
|||||||
return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
|
return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif // HAVE_FNMATCH/!HAVE_FNMATCH
|
||||||
|
|
||||||
#ifdef __VISUALC__
|
#ifdef __VISUALC__
|
||||||
#pragma warning(default:4706) // assignment within conditional expression
|
#pragma warning(default:4706) // assignment within conditional expression
|
||||||
|
Reference in New Issue
Block a user