changed wxMatchWild() 3rd parameter not used under Unix - what is it good for?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
23d1d521c8
commit
dfcb1ae09d
@ -70,6 +70,11 @@
|
|||||||
#include <dir.h>
|
#include <dir.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "wx/setup.h"
|
||||||
|
#ifdef HAVE_FNMATCH_H
|
||||||
|
#include "fnmatch.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#endif
|
#endif
|
||||||
@ -1393,6 +1398,17 @@ bool wxIsWild( const wxString& pattern )
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef HAVE_FNMATCH_H
|
||||||
|
{
|
||||||
|
// dot_special: what is it supposed to do?
|
||||||
|
return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
|
||||||
|
#pragma error Broken implementation of wxMatchWild() -- needs fixing!
|
||||||
|
/*
|
||||||
|
* WARNING: this code is broken!
|
||||||
|
*/
|
||||||
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
||||||
{
|
{
|
||||||
wxString tmp1 = pat;
|
wxString tmp1 = pat;
|
||||||
@ -1527,4 +1543,5 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
|
|||||||
pattern++;
|
pattern++;
|
||||||
return ((*str == '\0') && (*pattern == '\0'));
|
return ((*str == '\0') && (*pattern == '\0'));
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
// Purpose:
|
// Purpose:
|
||||||
// Author: Robert Roebling
|
// Author: Robert Roebling
|
||||||
// Created: 01/02/97
|
// Created: 01/02/97
|
||||||
// Id:
|
// Id: $Id$
|
||||||
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
|
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
|
||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
@ -28,6 +28,7 @@
|
|||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
|
|
||||||
#ifdef __SVR4__
|
#ifdef __SVR4__
|
||||||
#include <sys/systeminfo.h>
|
#include <sys/systeminfo.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
// Purpose:
|
// Purpose:
|
||||||
// Author: Robert Roebling
|
// Author: Robert Roebling
|
||||||
// Created: 01/02/97
|
// Created: 01/02/97
|
||||||
// Id:
|
// Id: $Id$
|
||||||
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
|
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
|
||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
@ -28,6 +28,7 @@
|
|||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
|
|
||||||
#ifdef __SVR4__
|
#ifdef __SVR4__
|
||||||
#include <sys/systeminfo.h>
|
#include <sys/systeminfo.h>
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user