summaryrefslogtreecommitdiffstats
path: root/win/tkWinMenu.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2007-06-09 23:53:05 (GMT)
committerhobbs <hobbs>2007-06-09 23:53:05 (GMT)
commitad0ffba4ba57f9c993a6418e891e945f6d4a5439 (patch)
treec753a0143a7574967bc5859aa5ab3cade093af06 /win/tkWinMenu.c
parentfcd7a3968daa37ea2184e281645832703b9b541a (diff)
downloadtk-ad0ffba4ba57f9c993a6418e891e945f6d4a5439.zip
tk-ad0ffba4ba57f9c993a6418e891e945f6d4a5439.tar.gz
tk-ad0ffba4ba57f9c993a6418e891e945f6d4a5439.tar.bz2
* win/tkWinMenu.c (TkWinHandleMenuEvent): improve handling to
allow for unicode char menu indices and not use CharUpper on Tcl utf strings. [Bug #1734223]
Diffstat (limited to 'win/tkWinMenu.c')
-rw-r--r--win/tkWinMenu.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 5852d58..ee7b9c6 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.56 2007/05/05 07:33:08 dkf Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.57 2007/06/09 23:53:05 hobbs Exp $
*/
#define OEMRESOURCE
@@ -1100,35 +1100,34 @@ TkWinHandleMenuEvent(
break;
case WM_MENUCHAR: {
- unsigned char menuChar = (unsigned char) LOWORD(*pwParam);
-
hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
(char *) *plParam);
if (hashEntryPtr != NULL) {
int i, len, underline;
Tcl_Obj *labelPtr;
+ Tcl_UniChar *wlabel, menuChar;
*plResult = 0;
menuPtr = (TkMenu *) Tcl_GetHashValue(hashEntryPtr);
+ /*
+ * Assume we have something directly convertable to Tcl_UniChar.
+ * True at least for wide systems.
+ */
+ menuChar = Tcl_UniCharToUpper((Tcl_UniChar) LOWORD(*pwParam));
+
for (i = 0; i < menuPtr->numEntries; i++) {
underline = menuPtr->entries[i]->underline;
labelPtr = menuPtr->entries[i]->labelPtr;
if ((underline >= 0) && (labelPtr != NULL)) {
/*
- * Do the unicode call just to prevent overruns.
+ * Ensure we don't exceed the label length, then check
*/
-
- Tcl_GetUnicodeFromObj(labelPtr, &len);
- if (underline < len) {
- char *label = Tcl_GetString(labelPtr);
- char underlined = *Tcl_UtfAtIndex(label, underline);
-
- if (CharUpper((LPTSTR) menuChar) ==
- CharUpper((LPTSTR) underlined)) {
- *plResult = (2 << 16) | i;
- returnResult = 1;
- break;
- }
+ wlabel = Tcl_GetUnicodeFromObj(labelPtr, &len);
+ if ((underline < len) && (menuChar ==
+ Tcl_UniCharToUpper(wlabel[underline]))) {
+ *plResult = (2 << 16) | i;
+ returnResult = 1;
+ break;
}
}
}