Drop WX_NO_REGEX_ADVANCED and always define wxHAS_REGEX_ADVANCED

Using non-PCRE system regex library, which was the only build variant
when wxHAS_REGEX_ADVANCED was not defined, is not supported any more, so
simplify the code by not testing for it.
This commit is contained in:
Vadim Zeitlin
2021-07-17 17:40:16 +02:00
parent 3d8438619d
commit dbe0950384
9 changed files with 6 additions and 45 deletions

View File

@@ -40,11 +40,6 @@
#endif
// many of the tests are specific to the builtin regex lib, so only attempts
// to do them when using the builtin regex lib.
//
#ifdef wxHAS_REGEX_ADVANCED
#include "wx/regex.h"
#include <string>
#include <vector>
@@ -347,10 +342,8 @@ void RegExTestCase::runTest()
doTest(wxRE_BASIC);
if (m_extended)
doTest(wxRE_EXTENDED);
#ifdef wxHAS_REGEX_ADVANCED
if (m_advanced || (!m_basic && !m_extended))
doTest(wxRE_ADVANCED);
#endif
}
// Try the test for a single flavour of expression
@@ -492,6 +485,4 @@ CheckRE(
#include "regex.inc"
#endif // wxHAS_REGEX_ADVANCED
#endif // wxUSE_REGEX