summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tkTextDisp.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f0663cd..fcbb3a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-26 Francois Vogel <fvogelnew1@free.fr>
+
+ * generic/tkTextDisp.c: [Bug-1754043] and [Bug-2321450]: When
+ -blockcursor is true, the cursor appears as a blinking bar which
+ expands to the right edge of the widget.
+
2012-01-25 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkImgPhoto.c: [Bug 2433260]: non-critical error in
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 4eca4ca..249f476 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6850,6 +6850,9 @@ TkTextIndexBbox(
if (charWidthPtr != NULL) {
*charWidthPtr = dInfoPtr->maxX - *xPtr;
+ if (*charWidthPtr > textPtr->charWidth) {
+ *charWidthPtr = textPtr->charWidth;
+ }
}
if (*xPtr > dInfoPtr->maxX) {
*xPtr = dInfoPtr->maxX;