backport of Mac OS X specific changes on trunk since 8.4.2:

	* macosx/tkMacOSXClipboard.c (TkSelGetSelection): Convert
	'\r' to '\n' on the way into Tcl. (ingham)

	* macosx/tkMacOSXMenu.c (EventuallyInvokeMenu): New function,
	used to invoke menu commands at idle time.
	(TkMacOSXDispatchMenuEvent): Don't immediately dispatch menu
	commands, wait till the idle loop to do so.  This is more like
	what is done on Windows, and avoids the crash from destroying
	a menu in it's command. (ingham)

	* macosx/tkMacOSXHLEvents.c (ReallyKillMe): Don't force the shell
	to exit.  According to the OS X HI guidelines, it should be
	possible to cancel an attempt to quit, and if we force the kill,
	here, it would not be possible to implement this. (ingham)

	* macosx/tkMacOSXApplication.r (removed):
	* macosx/tkMacOSXLibrary.r (removed):
	* macosx/tkMacOSXResource.r (removed):
	* macosx/Wish.pbproj/project.pbxproj:
	* macosx/tkAboutDlg.r: updated copyrights, cleaned up about box,
	removed obsolete unused resource files. (steffen)

1 files changed, 21 insertions, 37 deletions

diff --git a/macosx/tkAboutDlg.r b/macosx/tkAboutDlg.r
index b60f09a..aebdac7 100644
--- a/macosx/tkAboutDlg.r
+++ b/macosx/tkAboutDlg.r
@@ -10,19 +10,9 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkAboutDlg.r,v 1.3 2002/09/12 17:34:16 das Exp $
+ * RCS: @(#) $Id: tkAboutDlg.r,v 1.3.2.1 2003/05/13 02:42:57 das Exp $
  */
 
-
-
-/*
- * New style DLOG templates have an extra field for the positioning
- * options for the Dialog Box.  We will not use this, for now, so we
- * turn it off here.
- */
- 
-#define DLOG_RezTemplateVersion 0
-
 /*
  * The folowing include and defines help construct
  * the version string for Tcl.
@@ -33,22 +23,6 @@
 #include <tcl.h>
 #include "tk.h"
 
-#if (TK_RELEASE_LEVEL == 0)
-#   define RELEASE_LEVEL alpha
-#elif (TK_RELEASE_LEVEL == 1)
-#   define RELEASE_LEVEL beta
-#elif (TK_RELEASE_LEVEL == 2)
-#   define RELEASE_LEVEL final
-#endif
-
-#if (TK_RELEASE_LEVEL == 2)
-#   define MINOR_VERSION (TK_MINOR_VERSION * 16) + TK_RELEASE_SERIAL
-#else
-#   define MINOR_VERSION TK_MINOR_VERSION * 16
-#endif
-
-#define RELEASE_CODE 0x00
-
 /*
  * The following two resources define the default "About Box" for Mac Tk.
  * This dialog appears if the "About Tk..." menu item is selected from
@@ -58,19 +32,29 @@
  * create and manage an About Dialog box.
  */
  
-data 'DLOG' (128, "Default About Box", purgeable) {
-	$"0055 006B 00F3 0196 0001 0100 0100 0000"
-	$"0000 0081 0000 280A"
+resource 'DLOG' (128, "About Box", purgeable) {
+    {60, 40, 300, 404},
+    movableDBoxProc,
+    visible,
+    noGoAway,
+    0x0,
+    128,
+    "About Tcl & Tk",
+    centerMainScreen
 };
 
-resource 'DITL' (129, "About Box", purgeable) {
+resource 'DITL' (128, "About Box", purgeable) {
     {
-	{128, 128, 148, 186}, Button	    {enabled, "Ok"},
-	{ 14, 108, 117, 298}, StaticText    {disabled, 
-	    "Wish - Windowing Shell" "\n" "based on Tcl " 
-	    TCL_PATCH_LEVEL " & Tk " TK_PATCH_LEVEL "\n\n" "Jim Ingham & Ray Johnson"
-	    "Scriptics Inc." "\n" "jingham@cygnus.com"},	    
-        { 11,  24, 111,  92}, Picture  {enabled, 128}
+	{200, 147, 220, 217}, Button	    {enabled, "Ok"},
+	{ 20, 108, 180, 344}, StaticText    {disabled, 
+	    "Tcl " TCL_PATCH_LEVEL " & Tk " TK_PATCH_LEVEL "\n\n" 
+	    "© 2003 Tcl Core Team." "\n\n" 
+	    "Jim Ingham & Ian Reid" "\n"
+	    "© 2001-2002 Apple Computer, Inc." "\n\n" 
+	    "Jim Ingham & Ray Johnson" "\n"
+	    "© 1998-2000 Scriptics Inc." "\n"
+	    "© 1996-1997 Sun Microsystems Inc."},	    
+	{ 20,  24, 120, 92}, Picture  {enabled, 128}
     }
 };