diff options
| author | wolfsuit <wolfsuit> | 2004-02-14 01:26:48 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2004-02-14 01:26:48 (GMT) |
| commit | 7e16e1390f3c1d424934e5031458ee09fa166f86 (patch) | |
| tree | ef8286e046fc14d50c893e3624238064e45c5a16 /macosx/tkMacOSXMenu.c | |
| parent | 60f6fecb3068f40ba0e52153975314ce2e24bda2 (diff) | |
| download | tk-7e16e1390f3c1d424934e5031458ee09fa166f86.zip tk-7e16e1390f3c1d424934e5031458ee09fa166f86.tar.gz tk-7e16e1390f3c1d424934e5031458ee09fa166f86.tar.bz2 | |
Apply patch 112997, and kill a few more places where we were still using
Pascal string interfaces.
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 8005558..d914c4f 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.10 2003/08/12 08:49:22 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.11 2004/02/14 01:26:49 wolfsuit Exp $ */ #include "tkMacOSXInt.h" #include "tkMenuButton.h" @@ -1044,7 +1044,6 @@ ReconfigureIndividualMenu( int count; int index; TkMenuEntry *mePtr; - Str255 itemText; int parentDisabled = 0; for (mePtr = menuPtr->menuRefPtr->parentEntryPtr; mePtr != NULL; @@ -2158,9 +2157,11 @@ TkMacOSXDispatchMenuEvent( TkMenu *menuPtr = (TkMenu *) Tcl_GetHashValue(commandEntryPtr); if ((currentAppleMenuID == menuID) && (index > menuPtr->numEntries + 1)) { - Str255 itemText; - - GetMenuItemText(GetMenuHandle(menuID), index, itemText); + /* + * We don't need to do anything here, the standard + * Application event handler will open the built-in + * Apple menu item for us. + */ result = TCL_OK; } else { struct MenuCommandHandlerData *data |