From 5145ea908c8297e0903d5d1d022367daa9e53f4f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 17 Oct 2006 03:03:22 +0000 Subject: [PATCH] fix drawing of multi-character strings with font substitution and rotation svn: r4616 --- src/wxxt/src/DeviceContexts/WindowDC.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wxxt/src/DeviceContexts/WindowDC.cc b/src/wxxt/src/DeviceContexts/WindowDC.cc index 8bd9d5874a..0316e8f989 100644 --- a/src/wxxt/src/DeviceContexts/WindowDC.cc +++ b/src/wxxt/src/DeviceContexts/WindowDC.cc @@ -2377,16 +2377,17 @@ void wxWindowDC::DrawText(char *orig_text, double x, double y, while (1) { cval = text[dt]; if (!XftGlyphExists(DPY, this_time, cval)) { - this_time = (wxFontStruct*)current_font->GetNextAASubstitution(index++, cval, scale_x, scale_y, angle); + this_time = (wxFontStruct*)current_font->GetNextAASubstitution(index, cval, scale_x, scale_y, angle); if (!this_time) { this_time = xfontinfo; this_time_no_rotate = no_rotate; break; } if (angle != 0.0) - this_time_no_rotate = (wxFontStruct*)current_font->GetNextAASubstitution(index++, cval, e_scale_x, e_scale_y, 0.0); + this_time_no_rotate = (wxFontStruct*)current_font->GetNextAASubstitution(index, cval, e_scale_x, e_scale_y, 0.0); else this_time_no_rotate = this_time; + index++; } else break; }