summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXMenus.c
diff options
context:
space:
mode:
Diffstat (limited to 'macosx/tkMacOSXMenus.c')
-rw-r--r--macosx/tkMacOSXMenus.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index ab1926e..b5c319c 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -6,11 +6,12 @@
*
* Copyright (c) 1995-1996 Sun Microsystems, Inc.
* Copyright 2001, Apple Computer, Inc.
+ * Copyright (c) 2005-2006 Daniel A. Steffen <das@users.sourceforge.net>
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.11 2006/04/28 06:02:49 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.12 2006/05/12 18:17:48 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -192,7 +193,16 @@ TkMacOSXInitMenus(
if (TkMacOSXUseMenuID(kHMHelpMenuID) != TCL_OK) {
Tcl_Panic("Help menu ID %s is already in use!", kHMHelpMenuID);
}
-
+
+ /*
+ * Workarund a Carbon bug with kHICommandPreferences: the first call to
+ * IsMenuKeyEvent returns false for the preferences menu item key shorcut
+ * event (even if the corresponding menu item is dynamically enabled by a
+ * kEventCommandUpdateStatus handler), unless the kHICommandPreferences
+ * menu item has previously been enabled manually. [Bug 1481503]
+ */
+ EnableMenuCommand(NULL, kHICommandPreferences);
+
DrawMenuBar();
return;
}
@@ -304,3 +314,8 @@ SourceDialog()
Tcl_BackgroundError(gInterp);
}
}
+/*
+ * Local Variables:
+ * coding: macintosh;
+ * End:
+ */