summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXMenu.c
diff options
context:
space:
mode:
authorwolfsuit <wolfsuit>2004-02-14 01:08:28 (GMT)
committerwolfsuit <wolfsuit>2004-02-14 01:08:28 (GMT)
commit4c899ca0787f4fc4e71eb83694c5ee85f5bfaa72 (patch)
treed60273b901747b97991967ff18cfd24aebf2955d /macosx/tkMacOSXMenu.c
parent4e5ce2ab17562b7dd7e866e1e127d0f3f6c185c6 (diff)
downloadtk-4c899ca0787f4fc4e71eb83694c5ee85f5bfaa72.zip
tk-4c899ca0787f4fc4e71eb83694c5ee85f5bfaa72.tar.gz
tk-4c899ca0787f4fc4e71eb83694c5ee85f5bfaa72.tar.bz2
Applying Patch 112997, and hunting down a couple more places where we were
still using Pascal interfaces.
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
-rw-r--r--macosx/tkMacOSXMenu.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 2180bf9..eec9c77 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.6.2.2 2003/08/12 08:49:39 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.3 2004/02/14 01:08:28 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