diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 36 |
2 files changed, 35 insertions, 7 deletions
@@ -1,3 +1,9 @@ +2003-02-18 Vince Darley <vincentdarley@users.sourceforge.net> + + * macosx/tkMacOSXMenu.c: (SetMenuTitle) fix to utf encoding + problem when setting menu titles, and provisional support + for icons. + 2003-02-18 Donal K. Fellows <fellowsd@cs.man.ac.uk> * generic/tkImgGIF.c (FileReadGIF): Ensure that the trashBuffer is diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 2c8f173..bc01a32 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.4 2002/10/16 09:51:54 vincentdarley Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.5 2003/02/18 14:43:45 vincentdarley Exp $ */ #include "tkMacOSXInt.h" #include "tkMenuButton.h" @@ -863,14 +863,36 @@ FindMarkCharacter( static void mySetMenuTitle( MenuRef menuHdl, /* The menu we are setting the title of. */ - Tcl_Obj *titlePtr) /* The C string to set the title to. */ + Tcl_Obj *titlePtr) /* The C string to set the title to. */ { + char localBuffer[7]; + Boolean success; char *title = (titlePtr == NULL) ? "" - : Tcl_GetStringFromObj(titlePtr, NULL); - Str255 menuTitle; - menuTitle [ 0 ] = strlen ( title ) + 1; - strcpy ( menuTitle + 1, title ); - SetMenuTitle ( menuHdl, menuTitle ); + : Tcl_GetStringFromObj(titlePtr, NULL); + CFStringRef cf = CFStringCreateWithCString(NULL, + title, kCFStringEncodingUTF8); + + success = CFStringGetCString(cf, localBuffer, 7, kCFStringEncodingMacRoman); + if (success && (localBuffer[0] == '\245')) { + OSErr err; + IconSuiteRef ref; + int iconId = atoi(localBuffer + 1); + /* + * Until images/icons are properly supported on MacOS X, + * we allow the user to specify a bullet followed by + * a resource id to use an icon as a menu title + */ + err = GetIconSuite( &ref, iconId, kSelectorAllAvailableData ); + if (err == noErr) { + SetMenuTitleIcon(menuHdl,kMenuIconSuiteType,ref); + /* DisposeIconSuite(ref,true); */ + } else { + SetMenuTitleWithCFString(menuHdl, cf); + } + } else { + SetMenuTitleWithCFString(menuHdl, cf); + } + CFRelease(cf); } static int ParseAccelerators(char **accelStringPtr) { char *accelString = *accelStringPtr; |