diff options
| author | fvogel <fvogelnew1@free.fr> | 2021-11-16 20:39:47 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2021-11-16 20:39:47 (GMT) |
| commit | d8f50ac067d2f0df387ca0b0c46278c2464efc8b (patch) | |
| tree | 4c40167ca8b673d38459b4478944b8bc60cc4a7f /win/tkWinMenu.c | |
| parent | c56ea97892bf4b5716fd0c88709b0ef0cb130995 (diff) | |
| parent | a9827f93eadc2978316098553e09406dae1f5520 (diff) | |
| download | tk-d8f50ac067d2f0df387ca0b0c46278c2464efc8b.zip tk-d8f50ac067d2f0df387ca0b0c46278c2464efc8b.tar.gz tk-d8f50ac067d2f0df387ca0b0c46278c2464efc8b.tar.bz2 | |
Merge 8.6bug-b1d115fa60
Diffstat (limited to 'win/tkWinMenu.c')
| -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 67894c7..22e84cb 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)); } } |