diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 11:25:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 11:25:29 (GMT) |
| commit | c582be3c0f71b3545bb5ad4c4e7509fddd547586 (patch) | |
| tree | 50590849f17448d69e2a07794f34df7c4e738d0e /win/tkWinMenu.c | |
| parent | 87e7625c3c920df32eff50d6d50e98ba73bf495b (diff) | |
| parent | 3764526f9b0411b4d6f7b469aa0c12d7c0b1771a (diff) | |
| download | tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.zip tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.tar.gz tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win/tkWinMenu.c')
| -rw-r--r-- | win/tkWinMenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 5938f90..013d04c 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -610,7 +610,7 @@ ReconfigureWindowsMenu( if ((menuPtr->menuType == MENUBAR) || (menuPtr->menuFlags & MENU_SYSTEM_MENU)) { Tcl_DStringInit(&translatedText); - Tcl_UtfToUniCharDString(itemText, -1, &translatedText); + Tcl_UtfToWCharDString(itemText, -1, &translatedText); lpNewItem = (const WCHAR *) Tcl_DStringValue(&translatedText); flags |= MF_STRING; } else { @@ -1274,7 +1274,7 @@ TkWinHandleMenuEvent( Tcl_DStringFree(&ds); Tcl_DStringInit(&ds); - wlabel = (WCHAR *) Tcl_UtfToUniCharDString(src, len, &ds); + wlabel = (WCHAR *) Tcl_UtfToWCharDString(src, len, &ds); if ((underline + 1 < len + 1) && (menuChar == Tcl_UniCharToUpper(wlabel[underline]))) { *plResult = (2 << 16) | i; @@ -2581,7 +2581,7 @@ DrawTearoffEntry( int TkpConfigureMenuEntry( - register TkMenuEntry *mePtr)/* Information about menu entry; may or may + TkMenuEntry *mePtr)/* Information about menu entry; may or may * not already have values for some fields. */ { ScheduleMenuReconfigure(mePtr->menuPtr); |