diff options
| author | hobbs <hobbs> | 2006-11-24 18:11:32 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2006-11-24 18:11:32 (GMT) |
| commit | 97b9a81b9a7c013a7e2f45ec81b6767f7055b467 (patch) | |
| tree | aab98b52e367e849ad905fb7d36fa77422732416 /win | |
| parent | a3220fdf64e35fe118d44af78a8d9582b416fbd7 (diff) | |
| download | tk-97b9a81b9a7c013a7e2f45ec81b6767f7055b467.zip tk-97b9a81b9a7c013a7e2f45ec81b6767f7055b467.tar.gz tk-97b9a81b9a7c013a7e2f45ec81b6767f7055b467.tar.bz2 | |
* unix/tkUnixMenu.c (DrawMenuUnderline): bound Tcl_UtfAtIndex usage
* tests/menu.test (menu-36.1): [Bug 1599877]
Diffstat (limited to 'win')
| -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 564cc7a..0424563 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinMenu.c,v 1.50 2006/11/24 01:51:51 hobbs Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.51 2006/11/24 18:11:32 hobbs Exp $ */ #define OEMRESOURCE @@ -1125,7 +1125,7 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) Tcl_GetUnicodeFromObj(labelPtr, &len); if (underline < len) { char *label; - label = Tcl_GetStringFromObj(labelPtr, &len); + label = Tcl_GetStringFromObj(labelPtr, NULL); if (CharUpper((LPTSTR) menuChar) == CharUpper((LPTSTR) *Tcl_UtfAtIndex(label, underline))) { @@ -1912,7 +1912,7 @@ DrawMenuUnderline( if (mePtr->underline < len) { CONST char *label, *start, *end; - label = Tcl_GetStringFromObj(mePtr->labelPtr, &len); + label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL); start = Tcl_UtfAtIndex(label, mePtr->underline); end = Tcl_UtfNext(start); Tk_UnderlineChars(menuPtr->display, d, |