Calculate length explicitly (for wxUSE_STL == 1).

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

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index fc447594a556607a3c16daacf53a216fa90fcb77..80c76829fceb212a123e9cbd1aeffd425d8a457b 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -370,7 +370,7 @@ inline static wxString CharToString(wxMBConv *conv,
         return str;
     }
     else
         return str;
     }
     else

-        return wxString(s, len);
+        return wxString(s, len != wxSTRING_MAXLEN ? len : strlen(s));

 #endif
 }
 
 #endif
 }