added wxUSE_REGEX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 339deef635ceb429e03717959c5ce2033b1adac4..01ca99e4c59eebc1f6d6580707eeac72597f05eb 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -336,6 +336,14 @@
 #   endif
 #endif /* !defined(wxUSE_RADIOBTN) */
 
+#ifndef wxUSE_REGEX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_REGEX must be defined."
+#   else
+#       define wxUSE_REGEX 0
+#   endif
+#endif /* !defined(wxUSE_REGEX) */
+
 #ifndef wxUSE_SASH
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SASH must be defined."

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index d398e603852beae225929409eb6ad9e43483b8cb..4e8e6215fd7dec7bb65bc8b11025edc9372e47d8 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -386,6 +386,16 @@
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
 
+// Support for regular expression matching via wxRegEx class: enable this to
+// use POSIX regular expressions in your code. You need to compile regex
+// library from src/regex to use it under Windows.
+//
+// Default is 0
+//
+// Recommended setting: 1 if your compiler supports it, if it doesn't please
+// contribute us a makefile for src/regex for it
+#define wxUSE_REGEX       0
+
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------