Unicode compatibility

[wxWidgets.git] / src / common / regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 8503538f76137a95535c40e8487d0f5e69d11ffe..072ea9df0fb7244dc60bfbd38d5c48eeaed718fe 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -38,9 +38,12 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
-// FreeBSD & Watcom require this, it probably doesn't hurt for others
+// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it.
+// Others also don't seem to need it. If you have an error related to
+// (not) including <sys/types.h> please report details to
+// wx-dev@lists.wxwindows.org
 #if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
-    #include <sys/types.h>
+#   include <sys/types.h>
 #endif
 
 #ifndef __WXWINCE__
@@ -49,7 +52,7 @@
 
 #include "wx/regex.h"
 
-#if wxUSE_UNICODE
+#ifdef wx_wchar
     #define regerror wx_regerror
     #define regfree wx_regfree
 #endif
@@ -146,17 +149,17 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
     {
         len++;
 
-#if wxUSE_UNICODE
+#ifdef wx_wchar
         wxCharBuffer buf(len);
 
         (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
 
         msg = wxString(buf.data(), wxConvLibc);
-#else // !Unicode
+#else 
         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
 
         msg.UngetWriteBuf();
-#endif // Unicode/!Unicode
+#endif 
     }
     else // regerror() returned 0
     {
@@ -187,8 +190,8 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
 
 
     // compile it
-#if wxUSE_UNICODE
-    int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), REG_ADVANCED);
+#ifdef wx_wchar
+    int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE);
 #else
     int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
 #endif
@@ -266,7 +269,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
     }
 
     // do match it
-#if wxUSE_UNICODE
+#ifdef wx_wchar
        rm_detail_t rd;
     int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE);
 #else