diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index b752c39689..393c3842e4 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -537,15 +537,12 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, XYPOSITION * } ui++; } -#else - +#else // !wxUSE_UNICODE // If not unicode then just use the widths we have -#if wxUSE_STD_CONTAINERS - std::copy(tpos.begin(), tpos.end(), positions); -#else - memcpy(positions, tpos.begin(), len * sizeof(int)); -#endif -#endif + for (int i = 0; i < len; i++) { + positions[i] = tpos[i]; + } +#endif // wxUSE_UNICODE/!wxUSE_UNICODE }