summaryrefslogtreecommitdiffstats
path: root/win/tkWinMenu.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-05-03 22:40:30 (GMT)
committerhobbs <hobbs>2004-05-03 22:40:30 (GMT)
commite7513a24faa053ccefd16199f1faa3e459c9eb16 (patch)
tree0991e2d295fa96e9ed3e196167233c1475098e3e /win/tkWinMenu.c
parentbec318682f65b645a8915ca70da8b87e9fdf2b86 (diff)
downloadtk-e7513a24faa053ccefd16199f1faa3e459c9eb16.zip
tk-e7513a24faa053ccefd16199f1faa3e459c9eb16.tar.gz
tk-e7513a24faa053ccefd16199f1faa3e459c9eb16.tar.bz2
* win/tkWinX.c: fix drawing of unicode chars in menu
* win/tkWinInt.h (TkWinProcs): titles. [Bug #904371] (riefenstahl) * win/tkWinMenu.c (ReconfigureWindowsMenu):
Diffstat (limited to 'win/tkWinMenu.c')
-rw-r--r--win/tkWinMenu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index be00a5f..69f8eb7 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -9,7 +9,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.31 2004/01/07 13:25:56 vincentdarley Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.32 2004/05/03 22:40:30 hobbs Exp $
*/
#define OEMRESOURCE
@@ -574,7 +574,7 @@ ReconfigureWindowsMenu(
itemText = GetEntryText(mePtr);
if ((menuPtr->menuType == MENUBAR)
|| (menuPtr->menuFlags & MENU_SYSTEM_MENU)) {
- Tcl_UtfToExternalDString(NULL, itemText, -1, &translatedText);
+ Tcl_WinUtfToTChar(itemText, -1, &translatedText);
lpNewItem = Tcl_DStringValue(&translatedText);
flags |= MF_STRING;
} else {
@@ -686,7 +686,8 @@ ReconfigureWindowsMenu(
}
}
if (!systemMenu) {
- InsertMenu(winMenuHdl, 0xFFFFFFFF, flags, itemID, lpNewItem);
+ (*tkWinProcs->insertMenu)(winMenuHdl, 0xFFFFFFFF, flags,
+ itemID, lpNewItem);
}
Tcl_DStringFree(&translatedText);
if (itemText != NULL) {