X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59078e629d5ad9fc0b11dfd6100d0feff5af95d3..2f64c3bb2348ecd31a2f3973a6a10d1abff34e55:/src/common/regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 45efe1a5b2..943fc2c46b 100644
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -38,8 +38,8 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
-// FreeBSD requires this, it probably doesn't hurt for others
-#ifdef __UNIX__
+// FreeBSD & Watcom require this, it probably doesn't hurt for others
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
     #include <sys/types.h>
 #endif
 
@@ -73,17 +73,33 @@ private:
     // return the string containing the error message for the given err code
     wxString GetErrorMsg(int errorcode) const;
 
+    // init the members
+    void Init()
+    {
+        m_isCompiled = FALSE;
+        m_Matches = NULL;
+        m_nMatches = 0;
+    }
+
     // free the RE if compiled
     void Free()
     {
         if ( IsValid() )
         {
             regfree(&m_RegEx);
-
-            m_isCompiled = FALSE;
         }
+
+        delete [] m_Matches;
+    }
+
+    // free the RE if any and reinit the members
+    void Reinit()
+    {
+        Free();
+        Init();
     }
 
+
     // compiled RE
     regex_t     m_RegEx;
 
@@ -105,16 +121,12 @@ private:
 
 wxRegExImpl::wxRegExImpl()
 {
-    m_isCompiled = FALSE;
-    m_Matches = NULL;
-    m_nMatches = 0;
+    Init();
 }
 
 wxRegExImpl::~wxRegExImpl()
 {
     Free();
-
-    delete [] m_Matches;
 }
 
 wxString wxRegExImpl::GetErrorMsg(int errorcode) const
@@ -127,9 +139,17 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
     {
         len++;
 
+#if wxUSE_UNICODE
+        wxCharBuffer buf(len);
+
+        (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
+
+        msg = wxString(buf.data(), wxConvLibc);
+#else // !Unicode
         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
 
         msg.UngetWriteBuf();
+#endif // Unicode/!Unicode
     }
     else // regerror() returned 0
     {
@@ -141,7 +161,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)
 {
-    Free();
+    Reinit();
 
     // translate our flags to regcomp() ones
     wxASSERT_MSG( !(flags &
@@ -159,7 +179,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
         flagsRE |= REG_NEWLINE;
 
     // compile it
-    int errorcode = regcomp(&m_RegEx, expr, flagsRE);
+    int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
     if ( errorcode )
     {
         wxLogError(_("Invalid regular expression '%s': %s"),
@@ -230,7 +250,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
     }
 
     // do match it
-    int rc = regexec(&self->m_RegEx, str, m_nMatches, m_Matches, flagsRE);
+    int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE);
 
     switch ( rc )
     {