diff options
author | dgp <dgp@users.sourceforge.net> | 2012-12-04 16:37:18 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2012-12-04 16:37:18 (GMT) |
commit | 113feb6ab1ff04f9d02a2e0f4869e33f7a3c5458 (patch) | |
tree | b0fdcc8a70e63856b4cd8894cb579d21f1365a7a /generic/tkTextIndex.c | |
parent | 095fb9e4a3e83c678d92eb6a59f17b9c98b9ab55 (diff) | |
parent | da50f34ecbf4db62aacd90cbd9a7f9788d72110b (diff) | |
download | tk-113feb6ab1ff04f9d02a2e0f4869e33f7a3c5458.zip tk-113feb6ab1ff04f9d02a2e0f4869e33f7a3c5458.tar.gz tk-113feb6ab1ff04f9d02a2e0f4869e33f7a3c5458.tar.bz2 |
[Bug 3588824]: bug in image index handling for weird image names
Diffstat (limited to 'generic/tkTextIndex.c')
-rw-r--r-- | generic/tkTextIndex.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index a9b0bed..70c94db 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -758,9 +758,11 @@ GetIndex( /* *--------------------------------------------------------------------- - * Stage 1: check to see if the index consists of nothing but a mark name. - * We do this check now even though it's also done later, in order to - * allow mark names that include funny characters such as spaces or "+1c". + * Stage 1: check to see if the index consists of nothing but a mark + * name, an embedded window or an embedded image. We do this check + * now even though it's also done later, in order to allow mark names, + * embedded window names or image names that include funny characters + * such as spaces or "+1c". *--------------------------------------------------------------------- */ @@ -768,6 +770,14 @@ GetIndex( goto done; } + if (TkTextWindowIndex(textPtr, string, indexPtr) != 0) { + return TCL_OK; + } + + if (TkTextImageIndex(textPtr, string, indexPtr) != 0) { + return TCL_OK; + } + /* *------------------------------------------------ * Stage 2: start again by parsing the base index. |