diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-24 16:08:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-24 16:08:15 (GMT) |
| commit | a820220b3d4be7f09e9eb56fa090642f316bf3fb (patch) | |
| tree | 2b32739d41f5970b16ba31fffd44a398dee08481 /unix | |
| parent | d6d676512fab10d31a6fc83012b29505d11a3a89 (diff) | |
| download | tk-a820220b3d4be7f09e9eb56fa090642f316bf3fb.zip tk-a820220b3d4be7f09e9eb56fa090642f316bf3fb.tar.gz tk-a820220b3d4be7f09e9eb56fa090642f316bf3fb.tar.bz2 | |
::tk::startOfCluster/::tk::endOfCluster are now giving the correct result on ICU 68 (or ICU 64 on XQuarz)
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixMenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index 08df309..4ae25d5 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.c @@ -854,13 +854,13 @@ DrawMenuUnderline( if ((mePtr->underline >= 0) && (mePtr->labelPtr != NULL)) { int len; - len = Tcl_GetCharLength(mePtr->labelPtr); + len = TkNumUtfChars(Tcl_GetString(mePtr->labelPtr), -1); if (mePtr->underline < len) { int activeBorderWidth, leftEdge, ch; const char *label, *start, *end; label = Tcl_GetString(mePtr->labelPtr); - start = Tcl_UtfAtIndex(label, mePtr->underline); + start = TkUtfAtIndex(label, mePtr->underline); end = start + TkUtfToUniChar(start, &ch); Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, |