diff options
| author | vincentdarley <vincentdarley> | 2003-07-18 11:04:58 (GMT) |
|---|---|---|
| committer | vincentdarley <vincentdarley> | 2003-07-18 11:04:58 (GMT) |
| commit | ed5580c0df82dff12f9679b64ba4bf1424adfd0f (patch) | |
| tree | a7f72cab9fe59571cc55d0f567aab23a8ad11a66 /macosx/tkMacOSXMenu.c | |
| parent | 2a536d15c96c18d94c90cfb3eb881e912a960964 (diff) | |
| download | tk-ed5580c0df82dff12f9679b64ba4bf1424adfd0f.zip tk-ed5580c0df82dff12f9679b64ba4bf1424adfd0f.tar.gz tk-ed5580c0df82dff12f9679b64ba4bf1424adfd0f.tar.bz2 | |
MacOSX fixes
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index bfaff7e..a69e871 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.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: tkMacOSXMenu.c,v 1.8 2003/03/12 05:56:21 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.9 2003/07/18 11:04:59 vincentdarley Exp $ */ #include "tkMacOSXInt.h" #include "tkMenuButton.h" @@ -3427,6 +3427,8 @@ DrawMenuEntryLabel( GDHandle saveDevice; GWorldPtr destPort; #ifdef USE_ATSU + int xLocation; + int yLocation; int runLengths; CFStringRef stringRef; ATSUTextLayout textLayout; @@ -3472,7 +3474,8 @@ DrawMenuEntryLabel( #ifdef USE_ATSU runLengths = 1; length = Tcl_DStringLength(&itemTextDString); - stringRef = CFStringCreateWithCString(NULL, Tcl_DStringValue(&itemTextDString), GetApplicationTextEncoding()); + stringRef = CFStringCreateWithCString(NULL, Tcl_DStringValue(&itemTextDString), + kCFStringEncodingUTF8); if (!stringRef) { fprintf(stderr,"CFStringCreateWithCString failed\n"); } @@ -3494,7 +3497,7 @@ DrawMenuEntryLabel( TkMacOSXSetUpGraphicsPort(gc, destPort); MoveTo((short) leftEdge, (short) baseline); - Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&itemTextDString), + Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, Tcl_DStringValue(&itemTextDString), Tcl_DStringLength(&itemTextDString), &convertedTextDString); #ifdef USE_ATSU xLocation = leftEdge<<16; |