Made the #if wxUSE_UNICODE check correctly...

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 38d5e6431d064f9566058021822cacba766c2ebd..8983f98d02ed84bc68c91f145cd0d32e31133c34 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -49,6 +49,11 @@
 
 #include "wx/regex.h"
 
 
 #include "wx/regex.h"
 

+#if wxUSE_UNICODE
+    #define regerror wx_regerror
+    #define regfree wx_regfree
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -182,7 +187,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
 
 
     // compile it
 
 
     // compile it

-#if wxUSE_NEW_REGEX
+#if wxUSE_UNICODE

     int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE);
 #else
     int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
     int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE);
 #else
     int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);


@@ -261,7 +266,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
     }
 
     // do match it
     }
 
     // do match it

-#ifdef wxUSE_NEW_REGEX
+#if wxUSE_UNICODE

        rm_detail_t rd;
     int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE);
 #else
        rm_detail_t rd;
     int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE);
 #else