summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--macosx/tkMacOSXKeyEvent.c3
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fe28d86..17e429d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-25 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/tkMacOSXKeyEvent.c (TkMacOSXProcessKeyboardEvent): handle key
+ shortcut for kHICommandQuit in the same way as other application menu
+ item key shortcuts. [Bug 1516950]
+
2006-07-24 Daniel Steffen <das@users.sourceforge.net>
* macosx/tkMacOSXWm.c (TkWmMapWindow): fix incorrect values of wmInfo
@@ -186,7 +192,7 @@
2006-05-04 Don Porter <dgp@users.sourceforge.net>
- * README: Bump version number to 8.5a4
+ * README: Bump version number to 8.5a5
* generic/tk.h:
* unix/configure.in:
* unix/tk.spec:
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 070c3d4..470fdee 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -54,7 +54,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.16 2006/07/20 06:25:19 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.17 2006/07/25 12:08:59 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -194,6 +194,7 @@ TkMacOSXProcessKeyboardEvent(
case kHICommandHideOthers:
case kHICommandShowAll:
case kHICommandPreferences:
+ case kHICommandQuit:
statusPtr->stopProcessing = 0;
return 0; /* TODO: may not be on event on queue. */
break;