diff options
author | fvogel <fvogelnew1@free.fr> | 2016-12-30 22:20:00 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2016-12-30 22:20:00 (GMT) |
commit | aec9ede5b3da6947ff19211dab99b56bb5379305 (patch) | |
tree | 4a6958521807d8c72bbe8a5e25d32cc3630bef03 /win/tkWinFont.c | |
parent | 531e91677e137dc0d6109374daef5cc802bf7c7d (diff) | |
download | tk-aec9ede5b3da6947ff19211dab99b56bb5379305.zip tk-aec9ede5b3da6947ff19211dab99b56bb5379305.tar.gz tk-aec9ede5b3da6947ff19211dab99b56bb5379305.tar.bz2 |
Do everything the other way round. Leave things how they were on OS X (revert [a076cf64] and [42e0339e]), and fix TkpDrawCharsInContext() on Win and Linux in case these platforms at some point of time decide to define TK_LAYOUT_WITH_BASE_CHUNKS and TK_DRAW_IN_CONTEXT to true
Diffstat (limited to 'win/tkWinFont.c')
-rw-r--r-- | win/tkWinFont.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 47c4c3c..860451b 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -1407,9 +1407,13 @@ TkpDrawCharsInContext( * whole (not just the range) string when * drawing. */ { + int widthUntilStart; + (void) numBytes; /*unused*/ + + Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart); Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart, - rangeLength, x, y); + rangeLength, x+widthUntilStart, y); } /* |