* macosx/Wish.sdef (new file): Install and enable sdef file

	* macosx/Wish-Info.plist.in:		into Wish application bundle,
	* macosx/Tk.xcode/project.pbxproj:	describing TkAqua apple event
	* macosx/Tk.xcodeproj/project.pbxproj:	support for use by AppleScript.
	* unix/Makefile.in:			(replaces functionality of
	* unix/configure.in:			'aete' resource removed with
						Cocoa port & fixes AppleScript
						issues reported on tcl-mac)

7 files changed, 85 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a60818b..dc2dff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2009-08-24  Daniel Steffen  <das@users.sourceforge.net>
+
+	* generic/tkBind.c (HandleEventGenerate): Don't generate events for
+	windows that don't exist yet (fixes TkAqua testsuite crash).
+
+	* macosx/tkMacOSXWindowEvent.c: Allow WM_DELETE_WINDOW handlers to
+	prevent window closure by generating WM destroy event earlier (from
+	window delegate's -windowShouldClose:). [Bug 2821084]
+
+	* macosx/tkMacOSXDraw.c (TkMacOSX{Setup,Restore}DrawingContext):
+	Disable window flushing during Tk drawing to avoid immediate flush of
+	NSView-based native widgets on draw. (fixes drawing performance issue
+	reported by Youness Alaoui on tcl-mac)
+
+	* macosx/tkMacOSXHLEvents.c (ScriptHandler):	Fix "do script" apple
+	* carbon/tkMacOSXHLEvents.c (ScriptHandler):	event handler issues
+	on recent OS X releases by using AE coercion to 'utf8' for text data
+	and to 'fsrf' for alias data. (reported by Youness Alaoui on tcl-mac)
+
+	* macosx/Wish.sdef (new file):		Install and enable sdef file
+	* macosx/Wish-Info.plist.in:		into Wish application bundle,
+	* macosx/Tk.xcode/project.pbxproj:	describing TkAqua apple event
+	* macosx/Tk.xcodeproj/project.pbxproj:	support for use by AppleScript.
+	* unix/Makefile.in:			(replaces functionality of
+	* unix/configure.in:			'aete' resource removed with
+						Cocoa port & fixes AppleScript
+						issues reported on tcl-mac)
+	* unix/configure: autoconf-2.59
+
+	* carbon/Wish.xcode/project.pbxproj:	remove references to obsolete
+	* carbon/Wish.xcodeproj/project.pbxproj: prolog.ps file.
+
 2009-08-19  Peter Spjuth  <peter.spjuth@gmail.com>
 
 	* generic/tk.h
diff --git a/macosx/Tk.xcode/project.pbxproj b/macosx/Tk.xcode/project.pbxproj
index 6104650..f80a204 100644
--- a/macosx/Tk.xcode/project.pbxproj
+++ b/macosx/Tk.xcode/project.pbxproj
@@ -2033,6 +2033,7 @@
 		F974D57B0FBE7EC000BF728B /* tk.pc.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tk.pc.in; sourceTree = "<group>"; };
 		F974D57C0FBE7EFF00BF728B /* iconlist.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = iconlist.tcl; sourceTree = "<group>"; };
 		F974D57D0FBE7EFF00BF728B /* icons.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = icons.tcl; sourceTree = "<group>"; };
+		F97590AE1039A96200558A9A /* Wish.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.sdef; path = Wish.sdef; sourceTree = "<group>"; };
 		F976F6A70C325FB6005066D9 /* tkMacOSXPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkMacOSXPrivate.h; sourceTree = "<group>"; };
 		F97AE7F10B65C1E900310EA2 /* Tk-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tk-Common.xcconfig"; sourceTree = "<group>"; };
 		F97AE82B0B65C69B00310EA2 /* Tk-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tk-Release.xcconfig"; sourceTree = "<group>"; };
@@ -2113,7 +2114,7 @@
 				F966C06F08F281DC005CB29B /* Frameworks */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
 			);
-			comments = "Copyright (c) 2004-2009 Daniel A. Steffen <das@users.sourceforge.net>\nCopyright 2008-2009, Apple Inc.\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.1 2009/06/29 14:35:01 das Exp $\n";
+			comments = "Copyright (c) 2004-2009 Daniel A. Steffen <das@users.sourceforge.net>\nCopyright 2008-2009, Apple Inc.\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.2 2009/08/24 00:57:20 das Exp $\n";
 			name = Tk;
 			path = .;
 			sourceTree = SOURCE_ROOT;
@@ -2618,6 +2619,7 @@
 				F95D8D4B0F1715610006B020 /* Tk.icns */,
 				F95D8D4C0F1715610006B020 /* Tk.tiff */,
 				F966BBF708F27A3C005CB29B /* Wish-Info.plist.in */,
+				F97590AE1039A96200558A9A /* Wish.sdef */,
 				F97AE7F10B65C1E900310EA2 /* Tk-Common.xcconfig */,
 				F97AE8330B65C87F00310EA2 /* Tk-Debug.xcconfig */,
 				F97AE82B0B65C69B00310EA2 /* Tk-Release.xcconfig */,
diff --git a/macosx/Tk.xcodeproj/project.pbxproj b/macosx/Tk.xcodeproj/project.pbxproj
index c03e0bb..7b8a314 100644
--- a/macosx/Tk.xcodeproj/project.pbxproj
+++ b/macosx/Tk.xcodeproj/project.pbxproj
@@ -2033,6 +2033,7 @@
 		F974D57B0FBE7EC000BF728B /* tk.pc.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tk.pc.in; sourceTree = "<group>"; };
 		F974D57C0FBE7EFF00BF728B /* iconlist.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = iconlist.tcl; sourceTree = "<group>"; };
 		F974D57D0FBE7EFF00BF728B /* icons.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = icons.tcl; sourceTree = "<group>"; };
+		F97590AE1039A96200558A9A /* Wish.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.sdef; path = Wish.sdef; sourceTree = "<group>"; };
 		F976F6A70C325FB6005066D9 /* tkMacOSXPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkMacOSXPrivate.h; sourceTree = "<group>"; };
 		F97AE7F10B65C1E900310EA2 /* Tk-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tk-Common.xcconfig"; sourceTree = "<group>"; };
 		F97AE82B0B65C69B00310EA2 /* Tk-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Tk-Release.xcconfig"; sourceTree = "<group>"; };
@@ -2113,7 +2114,7 @@
 				F966C06F08F281DC005CB29B /* Frameworks */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
 			);
-			comments = "Copyright (c) 2004-2009 Daniel A. Steffen <das@users.sourceforge.net>\nCopyright 2008-2009, Apple Inc.\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.1 2009/06/29 14:35:01 das Exp $\n";
+			comments = "Copyright (c) 2004-2009 Daniel A. Steffen <das@users.sourceforge.net>\nCopyright 2008-2009, Apple Inc.\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.2 2009/08/24 00:57:20 das Exp $\n";
 			name = Tk;
 			path = .;
 			sourceTree = SOURCE_ROOT;
@@ -2618,6 +2619,7 @@
 				F95D8D4B0F1715610006B020 /* Tk.icns */,
 				F95D8D4C0F1715610006B020 /* Tk.tiff */,
 				F966BBF708F27A3C005CB29B /* Wish-Info.plist.in */,
+				F97590AE1039A96200558A9A /* Wish.sdef */,
 				F97AE7F10B65C1E900310EA2 /* Tk-Common.xcconfig */,
 				F97AE8330B65C87F00310EA2 /* Tk-Debug.xcconfig */,
 				F97AE82B0B65C69B00310EA2 /* Tk-Release.xcconfig */,
diff --git a/macosx/Wish-Info.plist.in b/macosx/Wish-Info.plist.in
index a7c3746..31a4ea2 100644
--- a/macosx/Wish-Info.plist.in
+++ b/macosx/Wish-Info.plist.in
@@ -7,7 +7,7 @@
 	See the file "license.terms" for information on usage and redistribution of
 	this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-	RCS: @(#) $Id: Wish-Info.plist.in,v 1.5 2009/06/29 14:35:01 das Exp $
+	RCS: @(#) $Id: Wish-Info.plist.in,v 1.6 2009/08/24 00:57:20 das Exp $
 -->
 <plist version="1.0">
 <dict>
@@ -72,5 +72,7 @@ Copyright © 2001-2002 Jim Ingham &amp; Ian Reid</string>
 	<true/>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
+	<key>OSAScriptingDefinition</key>
+	<string>Wish.sdef</string>
 </dict>
 </plist>
diff --git a/macosx/Wish.sdef b/macosx/Wish.sdef
new file mode 100644
index 0000000..f388d7d
--- /dev/null
+++ b/macosx/Wish.sdef
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd">
+<!--
+	Copyright (c) 1997 Sun Microsystems, Inc.
+	Copyright 2009 Kevin Walzer/WordTech Communications LLC. 
+	Copyright (c) 2009 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: Wish.sdef,v 1.1 2009/08/24 00:57:20 das Exp $
+-->
+<dictionary title="Wish Terminology">
+	<suite name="Standard Suite" code="reqd" description="Common commands for all applications.">
+		<command name="open" code="aevtodoc" description="Open a document.">
+			<direct-parameter description="The file(s) to be opened.">
+				<type type="file"/>
+				<type type="file" list="yes"/>
+			</direct-parameter>
+		</command>
+		<command name="print" code="aevtpdoc" description="Print a document.">
+			<direct-parameter description="The file(s) to be printed.">
+				<type type="file" list="yes"/>
+				<type type="specifier"/>
+			</direct-parameter>
+		</command>
+		<command name="quit" code="aevtquit" description="Quit the application."/>
+	</suite>
+	<suite name="Wish Suite" code="WIsH" description="Commands for the Wish application.">
+		<command name="do script" code="miscdosc" description="Execute a Tcl script.">
+			<direct-parameter description="Script to execute" type="text">
+				<type type="text"/>
+			</direct-parameter>
+			<result description="Result">
+				<type type="text"/>
+			</result>
+		</command>
+	</suite>
+</dictionary>
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2535943..ab12e68 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.155 2009/07/18 08:16:09 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.156 2009/08/24 00:57:20 das Exp $
 
 # Current Tk version;  used in various names.
 
@@ -1577,7 +1577,8 @@ dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M
 		$(TOP_DIR)/macosx/*.icns $(TOP_DIR)/macosx/*.tiff \
 		$(TOP_DIR)/macosx/*.[ch] $(TOP_DIR)/macosx/*.in \
 		$(TOP_DIR)/macosx/*.ac $(TOP_DIR)/macosx/*.xcconfig \
-		$(TOP_DIR)/macosx/configure $(DISTDIR)/macosx
+		$(TOP_DIR)/macosx/*.sdef  $(TOP_DIR)/macosx/configure \
+		$(DISTDIR)/macosx
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
 	mkdir $(DISTDIR)/macosx/Tk.xcode
 	cp -p $(TOP_DIR)/macosx/Tk.xcode/project.pbxproj \
diff --git a/unix/configure.in b/unix/configure.in
index 8891fa5..2d41391 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.167 2009/07/14 08:23:46 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.168 2009/08/24 00:57:20 das Exp $
 
 AC_INIT([tk],[8.6])
 AC_PREREQ(2.59)
@@ -698,6 +698,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
         EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && mkdir -p "$(BIN_INSTALL_DIR)/../Resources"'
 	if test $tk_aqua = yes; then
 	    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
+	    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
 	else
 	    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.icns" "$(BIN_INSTALL_DIR)/../Resources" && echo "Installing ${WISH_RSRC_FILE} to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "${WISH_RSRC_FILE}" "$(BIN_INSTALL_DIR)/../Resources"'
         fi