X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..603cfe42185349e119ba4c69bd56a79998babcc4:/src/common/regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index f97d0727bc..4683b81de3 100644
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -520,7 +520,7 @@ int wxRegExImpl::Replace(wxString *text,
                     textstr + matchStart,
 #else
                     textstr.data() + matchStart,
-#endif 
+#endif
                     countRepl ? wxRE_NOTBOL : 0
                     WXREGEX_IF_NEED_LEN(textlen - matchStart)) )
     {
@@ -566,13 +566,14 @@ int wxRegExImpl::Replace(wxString *text,
                     }
                     else
                     {
+                        textNew += wxString(
 #ifndef WXREGEX_CONVERT_TO_MB
-                        textNew += wxString(textstr + matchStart + start,
+                                textstr
 #else
-                        textNew += wxString(textstr.data() + matchStart +
-					    start,
+                                textstr.data()
 #endif
-                                            *wxConvCurrent, len);
+                                + matchStart + start,
+                                *wxConvCurrent, len);
 
                         mayHaveBackrefs = true;
                     }
@@ -601,8 +602,7 @@ int wxRegExImpl::Replace(wxString *text,
 #ifndef WXREGEX_CONVERT_TO_MB
         result.append(*text, matchStart, start);
 #else
-        result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, 
-			       start));
+        result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, start));
 #endif
         matchStart += start;
         result.append(textNew);
@@ -646,8 +646,7 @@ bool wxRegEx::Compile(const wxString& expr, int flags)
     if ( !m_impl->Compile(expr, flags) )
     {
         // error message already given in wxRegExImpl::Compile
-        delete m_impl;
-        m_impl = NULL;
+        wxDELETE(m_impl);
 
         return false;
     }