summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2006-12-01 07:13:13 (GMT)
committerdas <das>2006-12-01 07:13:13 (GMT)
commit260b7669fe91bcce70291cebc46fce55570dbc98 (patch)
tree145291c85ee7362870f5eee3e424d36b76b0865d
parentd41ab6205872b1d12cfed06affa0795065da8f7c (diff)
downloadtk-260b7669fe91bcce70291cebc46fce55570dbc98.zip
tk-260b7669fe91bcce70291cebc46fce55570dbc98.tar.gz
tk-260b7669fe91bcce70291cebc46fce55570dbc98.tar.bz2
* macosx/tkMacOSXDialog.c (Tk_MessageBoxObjCmd): fix inability to use
buttons with standard Escape key binding as -default button (reported on tcl-mac by Hans-Christoph Steiner).
-rw-r--r--ChangeLog6
-rw-r--r--macosx/tkMacOSXDialog.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e8f7e8..57f3003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-30 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/tkMacOSXDialog.c (Tk_MessageBoxObjCmd): fix inability to use
+ buttons with standard Escape key binding as -default button (reported
+ on tcl-mac by Hans-Christoph Steiner).
+
2006-11-26 Daniel Steffen <das@users.sourceforge.net>
* tcl.m4 (Linux): --enable-64bit support. [Patch 1597389], [Bug 1230558]
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 51d62b9..350f1fe 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.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: tkMacOSXDialog.c,v 1.4.2.11 2006/04/11 12:05:18 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.12 2006/12/01 07:13:14 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -1537,6 +1537,9 @@ Tk_MessageBoxObjCmd(
goto end;
}
paramCFStringRec.defaultButton = defaultNativeButtonIndex;
+ if (paramCFStringRec.cancelButton == defaultNativeButtonIndex) {
+ paramCFStringRec.cancelButton = 0;
+ }
}
SetThemeCursor(kThemeArrowCursor);