don't stop on NULs in Replace()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/string.cpp

@@ -1239,18 +1239,12 @@ size_t wxString::Replace(const wxString& strOld,
     size_t uiOldLen = strOld.length();
     size_t uiNewLen = strNew.length();
 
-    size_t dwPos = 0;
+    for ( size_t dwPos = 0; dwPos < length(); )
-
-    while ( (*this)[dwPos] != wxT('\0') )
     {
-        //DO NOT USE STRSTR HERE
-        //this string can contain embedded null characters,
-        //so strstr will function incorrectly
         dwPos = find(strOld, dwPos);
         if ( dwPos == npos )
-            break;                  // exit the loop
+            break;
-        else
+
-        {
         // replace this occurance of the old string with the new one
         replace(dwPos, uiOldLen, strNew, uiNewLen);
 
@@ -1260,10 +1254,9 @@ size_t wxString::Replace(const wxString& strOld,
         // increase replace count
         ++uiCount;
 
-            // stop now?
+        // stop after the first one?
         if ( !bReplaceAll )
-                break;                  // exit the loop
+            break;
-        }
     }
 
     return uiCount;