From e1489d05279144b9219ebcf00a88fd7599bc01d7 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 21 Nov 2006 07:09:05 +0000 Subject: [PATCH] fix GetTextExtent for X11 svn: r4908 --- src/wxxt/src/DeviceContexts/WindowDC.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/wxxt/src/DeviceContexts/WindowDC.cc b/src/wxxt/src/DeviceContexts/WindowDC.cc index afa522db15..c3814a8f03 100644 --- a/src/wxxt/src/DeviceContexts/WindowDC.cc +++ b/src/wxxt/src/DeviceContexts/WindowDC.cc @@ -2156,11 +2156,10 @@ static unsigned int *convert_to_drawable_format(const char *s, int ds, long *_ul if (isUnicode) { us = (unsigned int *)s; if (ulen < 0) { - ulen = 0; for (ulen = ds; us[ulen]; ulen++) { } + ulen -= ds; } - ulen -= ds; if (ds) { if (ulen <= bufsize) us = buf;