summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-06-11 13:06:34 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-06-11 13:06:34 (GMT)
commit725e61cc4033c4fd2cccb831bac3c997fa61e712 (patch)
tree8fc0e479877a732f4eb916cbbf52501116159320
parentbac8a500d4926440f129c1ae37245e5a5bfcd997 (diff)
downloadtk-725e61cc4033c4fd2cccb831bac3c997fa61e712.zip
tk-725e61cc4033c4fd2cccb831bac3c997fa61e712.tar.gz
tk-725e61cc4033c4fd2cccb831bac3c997fa61e712.tar.bz2
fix test failure
-rw-r--r--generic/ttk/ttkEntry.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 044369c..e5d0ef2 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -1123,7 +1123,7 @@ EntryDoLayout(void *recordPtr)
* rightIndex is set to one past the last fully-visible character.
*/
Tk_CharBbox(textLayout, leftIndex, &leftX, NULL, NULL, NULL);
- rightIndex = Tk_PointToChar(textLayout, leftX + textarea.width, 0)+1;
+ rightIndex = Tk_PointToChar(textLayout, leftX + textarea.width, 0);
entryPtr->entry.layoutX = textarea.x - leftX;
}
@@ -1163,7 +1163,7 @@ static void EntryDisplay(void *clientData, Drawable d)
Entry *entryPtr = clientData;
Tk_Window tkwin = entryPtr->core.tkwin;
int leftIndex = entryPtr->entry.xscroll.first,
- rightIndex = entryPtr->entry.xscroll.last,
+ rightIndex = entryPtr->entry.xscroll.last + 1,
selFirst = entryPtr->entry.selectFirst,
selLast = entryPtr->entry.selectLast;
EntryStyleData es;
@@ -1265,7 +1265,7 @@ static void EntryDisplay(void *clientData, Drawable d)
/* Overwrite the selected portion (if any) in the -selectforeground color:
*/
if (showSelection) {
- gc = EntryGetGC(entryPtr, es.selForegroundObj, clipRegion);
+ gc = EntryGetGC(entryPtr, es.selForegroundObj, clipRegion);
Tk_DrawTextLayout(
Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
entryPtr->entry.layoutX, entryPtr->entry.layoutY,