From 0d79a679195959479daafbb433c3a04739ec5a28 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Aug 2008 23:03:55 +0000 Subject: [PATCH] no changes, just match the number of opening/closing braces to avoid upsetting Vim (and probably other editors) syntax highlighting git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/regex.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/regex.cpp b/src/common/regex.cpp index f6ca878291..7a7029c8b5 100644 --- a/src/common/regex.cpp +++ b/src/common/regex.cpp @@ -515,10 +515,11 @@ int wxRegExImpl::Replace(wxString *text, // note that "^" shouldn't match after the first call to Matches() so we // use wxRE_NOTBOL to prevent it from happening while ( (!maxMatches || countRepl < maxMatches) && + Matches( #ifndef WXREGEX_CONVERT_TO_MB - Matches(textstr + matchStart, + textstr + matchStart, #else - Matches(textstr.data() + matchStart, + textstr.data() + matchStart, #endif countRepl ? wxRE_NOTBOL : 0 WXREGEX_IF_NEED_LEN(textlen - matchStart)) )