diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-23 16:34:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-23 16:34:42 (GMT) |
| commit | 34bbe087ee9542cd9a5b43c0402cee944ffc1de9 (patch) | |
| tree | 163e8332504240ea9385d6fd1b13f7d608f26632 /win | |
| parent | 0dfa04b852a3325f3dfa641edba96e652a81718c (diff) | |
| parent | 811f1574bb3980d57f05b8334bd6d1aecdf4e32e (diff) | |
| download | tk-34bbe087ee9542cd9a5b43c0402cee944ffc1de9.zip tk-34bbe087ee9542cd9a5b43c0402cee944ffc1de9.tar.gz tk-34bbe087ee9542cd9a5b43c0402cee944ffc1de9.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinMenu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 02daf16..24e64f1 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -511,7 +511,7 @@ GetEntryText( : Tcl_GetString(mePtr->accelPtr); const char *p, *next; Tcl_DString itemString; - int ch; + Tcl_UniChar ch = 0; /* * We have to construct the string with an ampersand preceeding the @@ -528,16 +528,17 @@ GetEntryText( if (*p == '&') { Tcl_DStringAppend(&itemString, "&", 1); } - next = p + TkUtfToUniChar(p, &ch); + next = p + Tcl_UtfToUniChar(p, &ch); Tcl_DStringAppend(&itemString, p, (int) (next - p)); } + ch = 0; if (mePtr->accelLength > 0) { Tcl_DStringAppend(&itemString, "\t", 1); for (p = accel, i = 0; *p != '\0'; i++, p = next) { if (*p == '&') { Tcl_DStringAppend(&itemString, "&", 1); } - next = p + TkUtfToUniChar(p, &ch); + next = p + Tcl_UtfToUniChar(p, &ch); Tcl_DStringAppend(&itemString, p, (int) (next - p)); } } |