*** macosx-8-4-branch merged into the mainline [tcl patch #602770] ***macosx_8_4_merge_2002_08_31_trunk

	* generic/tk.decls:
	* generic/tkInt.decls: added new "aqua" specific entries to the
	stubs tables. Changed all "unix" entries to "x11" to allow us to
	distinguish and build both "aqua" on MacOSX and "x11" on MacOSX.

	* generic/tk.h: added a #ifnded RESOURCE_INCLUDED so that tk.h can
	be passed to the resource compiler.

	* generic/tkCmds.c (Tk_TkObjCmd): added [tk windowingsystem]
	subcommand: returns "x11" when running on X11, "win32" on Windows,
	"classic" on MacOS9 and "aqua" on MacOSX Aqua (i.e. Carbon)

	* generic/tkFont.c (TkFontGetFirstTextLayout): new private function
	returning the first chunk of a Tk_TextLayout, i.e. until the first
	font change on the first line (or the whole first line if there is
	no such font change).

	* generic/tkMain.c: made Tcl_ThreadDataKey static

	* library/demos/puzzle.tcl: fixed button metrics for aqua

	* tests/cursor.test: check for presence of arrow cursor instead of
	heart cursor

	* xlib/xcolors.c: changed xColors static initialization to more
	standard C

	* macosx/Wish.pbproj/jingham.pbxuser (new):
	* macosx/Wish.pbproj/project.pbxproj (new): project for Apple's
	ProjectBuilder IDE.

	* macosx/Makefile (new): simple makefile for building the project
	from the command line via the ProjectBuilder tool 'pbxbuild'.

	* macosx/tkMacOSXAppInit.c (new): macosx specific AppInit looking
	for a AppMain.tcl file in its bundled Resources/Scripts folder. If
	present, argv[1] is set to that file and the Scripts folder is
	added to the auto_path. This allows tk apps to embed scripts within
	their bundle directory structure.

	* macosx/tkMacOSXInit.c (new): macosx adapted version of
	tkUnixInit.c: we initialize & cache the Carbon native encoding
	(e.g. 'macRoman') and try to find the tk script library files
	inside Tk packaged as a framework.

	* macosx/tkMacOSXNotify.c (new): new macosx specific merged
	Carbon/select-based notifier.

	* macosx/tkMacOSXEvent.c (new):
	* macosx/tkMacOSXEvent.h (new):
	* macosx/tkMacOSXKeyEvent.c (new):
	* macosx/tkMacOSXMouseEvent.c (new):
	* macosx/tkMacOSXWindowEvent.c (new): new macosx specific event
	handling functionality.

	* macosx/tkMacOSX.h (new):
	* macosx/tkMacOSXBitmap.c (new):
	* macosx/tkMacOSXButton.c (new):
	* macosx/tkMacOSXClipboard.c (new):
	* macosx/tkMacOSXColor.c (new):
	* macosx/tkMacOSXConfig.c (new):
	* macosx/tkMacOSXCursor.c (new):
	* macosx/tkMacOSXDefault.h (new):
	* macosx/tkMacOSXDialog.c (new):
	* macosx/tkMacOSXDraw.c (new):
	* macosx/tkMacOSXEmbed.c (new):
	* macosx/tkMacOSXFont.c (new):
	* macosx/tkMacOSXHLEvents.c (new):
	* macosx/tkMacOSXInt.h (new):
	* macosx/tkMacOSXKeyboard.c (new):
	* macosx/tkMacOSXMenu.c (new):
	* macosx/tkMacOSXMenubutton.c (new):
	* macosx/tkMacOSXMenus.c (new):
	* macosx/tkMacOSXPort.h (new):
	* macosx/tkMacOSXRegion.c (new):
	* macosx/tkMacOSXScale.c (new):
	* macosx/tkMacOSXScrlbr.c (new):
	* macosx/tkMacOSXSubwindows.c (new):
	* macosx/tkMacOSXTest.c (new):
	* macosx/tkMacOSXUtil.c (new):
	* macosx/tkMacOSXUtil.h (new):
	* macosx/tkMacOSXWm.c (new):
	* macosx/tkMacOSXWm.h (new):
	* macosx/tkMacOSXXStubs.c (new): macosx ports of classic mac Tk
	implementation in tk/mac.

	* macosx/tkMacOSXSend.c (new): only send to local interp
	implemented currently.

	* macosx/tkMacOSXDebug.h (new):
	* macosx/tkMacOSXDebug.c (new): new macosx specific functions for
	debugging MacOS events, regions, etc.

	* macosx/tkAboutDlg.r (new):
	* macosx/tkMacOSXApplication.r (new):
	* macosx/tkMacOSXCursors.r (new):
	* macosx/tkMacOSXLibrary.r (new):
	* macosx/tkMacOSXMenu.r (new):
	* macosx/tkMacOSXResource.r (new):
	* macosx/tkMacOSXXCursors.r (new):
	* macosx/tclets.r (new): sources for Rez resource compiler.

	* macosx/Wish.icns (new): Wish application icon.

	* generic/tk.h:
	* generic/default.h:
	* generic/tkBind.c:
	* generic/tkCmds.c:
	* generic/tkGrab.c:
	* generic/tkPointer.c:
	* generic/tkPort.h:
	* generic/tkSelect.c:
	* generic/tkStubLib.c:
	* generic/tkTest.c:
	* generic/tkText.c:
	* generic/tkWindow.c:
	* unix/tkUnix3d.c:
	* xlib/xgc.c:
	* xlib/X11/X.h:
	* xlib/X11/Xlib.h:
	* xlib/X11/Xutil.h: added #includes and #ifdefs for macosx

	* library/bgerror.tcl:
	* library/button.tcl:
	* library/console.tcl:
	* library/dialog.tcl:
	* library/entry.tcl:
	* library/listbox.tcl:
	* library/menu.tcl:
	* library/msgbox.tcl:
	* library/scrlbar.tcl:
	* library/spinbox.tcl:
	* library/text.tcl:
	* library/tk.tcl:
	* library/demos/menu.tcl:
	* library/demos/menubu.tcl:
	* library/demos/widget: check [tk windowingsystem] instead of
	and/or in addition to $tcl_platform(platform).

	* generic/tkInt.h:
	* mac/tkMacBitmap.c:
	* mac/tkMacWm.c: added missing CONSTification

	* generic/tkIntDecls.h:
	* generic/tkIntPlatDecls.h:
	* generic/tkIntXlibDecls.h:
	* generic/tkPlatDecls.h:
	* generic/tkStubInit.c: regen

1 files changed, 172 insertions, 0 deletions

diff --git a/macosx/tclets.r b/macosx/tclets.r
new file mode 100644
index 0000000..ce68db4
--- /dev/null
+++ b/macosx/tclets.r
@@ -0,0 +1,172 @@
+/*
+ * tclets.r --
+ *
+ */
+
+/*
+ * 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
+
+#include <Types.r>
+#include <SysTypes.r>
+#include <AEUserTermTypes.r>
+
+/* 
+ * We now load the Tclets code into the resource fork
+ */
+
+#define TK_LIBRARY_RESOURCES 3000
+
+read 'TEXT' (TK_LIBRARY_RESOURCES+114, "tclshrc", purgeable) 
+	"::mac:tclets.tcl";
+
+data 'icns' (-16455) {
+	$"6963 6E73 0000 08F8 6963 7323 0000 0048"            /* icns...�ics#...H */
+	$"0100 02EE 05CE 09EE 13DE 23FF 47CE 86C6"            /* ...�.���.�#�GΆ� */
+	$"4681 22C2 12C4 0888 0410 0220 0140 0080"            /* F�"�.�.�... .@.� */
+	$"0100 03EE 07CE 0FEE 1FFE 3FFF 7FFE FFFE"            /* ...�.�.�.�?�.��� */
+	$"7FFF 3FFE 1FFC 0FF8 07F0 03E0 01C0 0080"            /* .�?�.�.�.�.�.�.� */
+	$"6963 7334 0000 0088 0000 000F 0000 0000"            /* ics4...�........ */
+	$"0000 00FC F6D0 FFF0 0000 0FC5 DD00 F6F0"            /* ...�����...��.�� */
+	$"0000 FCCD 66F0 F6F0 000F CC6E 66CE F6F0"            /* ..��f���..�nf��� */
+	$"00FC CC6E 67EF F6FF 0FCC CD66 66CC F6F0"            /* .��ng���.��ff��� */
+	$"FCCC CDDC 66CC CFA0 0FCC CD6C EDCC CC0F"            /* ����f�Ϡ.��l���. */
+	$"00FC CC6C E6CC CCF0 000F CC6C 66CC CF00"            /* .��l����..�lf��. */
+	$"0000 FCCC 6CCC F000 0000 0FCC DCCF 0000"            /* ..��l��....���.. */
+	$"0000 00FD DCF0 0000 0000 000F CF00 0000"            /* ...���......�... */
+	$"0000 0000 F000 0000 6963 7338 0000 0108"            /* ....�...ics8.... */
+	$"0000 0000 0000 00FF 0000 0000 0000 0000"            /* .......�........ */
+	$"0000 0000 0000 FF2B FFEC 7F00 FFFF FF00"            /* ......�+��..���. */
+	$"0000 0000 00FF 2BB0 7F7F 0000 FFEC FF00"            /* .....�+�....���. */
+	$"0000 0000 FF2B 2B7F ECEC FF00 FFEC FF00"            /* ....�++.���.���. */
+	$"0000 00FF 2B2B ECFC ECEC 2BFB FFEC FF00"            /* ...�++����+����. */
+	$"0000 FF2B 2B2B ECFC ECC0 FBFF FFEC FFFF"            /* ..�+++���������� */
+	$"00FF 2B2B 2B7F ECEC ECEC 2B2B FFEC FF00"            /* .�+++.����++���. */
+	$"FF2B 2B2B 2B7F 7FF6 ECEC 2B2B 2BFF FD00"            /* �++++..���+++��. */
+	$"00FF 2B2B 2B7F ECF6 FCF9 2B2B 2B2B 00FF"            /* .�+++.����++++.� */
+	$"0000 FF2B 2B2B ECF6 FCEC 2B2B 2B2B FF00"            /* ..�+++����++++�. */
+	$"0000 00FF 2B2B ECF6 ECEC 2B2B 2BFF 0000"            /* ...�++����+++�.. */
+	$"0000 0000 FF2B 2BF6 EC2B 2B2B FF00 0000"            /* ....�++��+++�... */
+	$"0000 0000 00FF 2BF6 F92B 2BFF 0000 0000"            /* .....�+��++�.... */
+	$"0000 0000 0000 FFF9 F92B FF00 0000 0000"            /* ......���+�..... */
+	$"0000 0000 0000 00FF 2BFF 0000 0000 0000"            /* .......�+�...... */
+	$"0000 0000 0000 0000 FF00 0000 0000 0000"            /* ........�....... */
+	$"4943 4E23 0000 0108 0001 0000 0002 8000"            /* ICN#..........�. */
+	$"0004 78F8 0008 70F8 0010 F0F8 0021 E8F8"            /* ..x�..p�..��.!�� */
+	$"0043 C4F8 0081 FAF8 0107 F1F8 0207 F0F8"            /* .C��.���..��..�� */
+	$"0407 F7FF 0807 E3FE 1007 E1FC 200E E0F8"            /* ..��..��..�� .�� */
+	$"4002 E074 800E E022 400E E001 200E C002"            /* @.�t�.�"@.�. .�. */
+	$"1006 E004 0806 C008 0406 E010 0202 C020"            /* ..�...�...�...�  */
+	$"0102 C040 0080 8080 0040 0100 0020 0200"            /* ..�@.���.@... .. */
+	$"0010 0400 0008 0800 0004 1000 0002 2000"            /* .............. . */
+	$"0001 4000 0000 8000 0001 0000 0003 8000"            /* ..@...�.......�. */
+	$"0007 F8F8 000F F0F8 001F F0F8 003F F8F8"            /* ..��..��..��.?�� */
+	$"007F FCF8 00FF FEF8 01FF FFF8 03FF FFF8"            /* ..��.���.���.��� */
+	$"07FF FFFF 0FFF FFFE 1FFF FFFC 3FFF FFF8"            /* .���.���.���?��� */
+	$"7FFF FFFC FFFF FFFE 7FFF FFFF 3FFF FFFE"            /* .�������.���?��� */
+	$"1FFF FFFC 0FFF FFF8 07FF FFF0 03FF FFE0"            /* .���.���.���.��� */
+	$"01FF FFC0 00FF FF80 007F FF00 003F FE00"            /* .���.���..�..?�. */
+	$"001F FC00 000F F800 0007 F000 0003 E000"            /* ..�...�...�...�. */
+	$"0001 C000 0000 8000 6963 6C34 0000 0208"            /* ..�...�.icl4.... */
+	$"0000 0000 0000 000F 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 00FC F000 0000 0000 0000"            /* .......��....... */
+	$"0000 0000 0000 0FCC CFD6 D000 FFFF F000"            /* .......����.���. */
+	$"0000 0000 0000 FCCC C556 0000 F767 F000"            /* ......���V..�g�. */
+	$"0000 0000 000F CCCC 566F 0000 F676 F000"            /* ......��Vo..�v�. */
+	$"0000 0000 00FC CCC5 6F5C F000 F767 F000"            /* .....���o\�.�g�. */
+	$"0000 0000 0FCC CC66 66CC 0F00 F676 F000"            /* .....��ff�..�v�. */
+	$"0000 0000 FCCC CCD5 5666 FCF0 F767 F000"            /* ....����Vf���g�. */
+	$"0000 000F CCCC C656 5667 CCCF F676 F000"            /* ....���VVg���v�. */
+	$"0000 00FC CCCC C6E5 5566 CCCC F767 F000"            /* ...�����Uf���g�. */
+	$"0000 0FCC CCCC C656 5657 CFFF F676 FFFF"            /* ...����VVW���v�� */
+	$"0000 FCCC CCCC C6E5 565C CCF7 6767 67F0"            /* ..������V\��ggg� */
+	$"000F CCCC CCCC C655 565C CCCF 7676 7F00"            /* ..�����UV\��vv.. */
+	$"00FC CCCC CCCC 7660 556C CCCC F767 F000"            /* .�����v`Ul���g�. */
+	$"0FCC CCCC CCCC CD5D 567C CCCC CF7F CF00"            /* .������]V|���.�. */
+	$"FCCC CCCC CCCC 6660 556C CCCC CCFC CCF0"            /* ������f`Ul������ */
+	$"0FCC CCCC CCCC 665C 565C CCCC CCCC CCCF"            /* .�����f\V\������ */
+	$"00FC CCCC CCCC 6660 E6DC CCCC CCCC CCF0"            /* .�����f`�������� */
+	$"000F CCCC CCCC C650 656C CCCC CCCC CF00"            /* ..�����Pel�����. */
+	$"0000 FCCC CCCC C6EC 5ECC CCCC CCCC F000"            /* ..������^������. */
+	$"0000 0FCC CCCC C650 566C CCCC CCCF 0000"            /* ...����PVl����.. */
+	$"0000 00FC CCCC CC50 D5CC CCCC CCF0 0000"            /* ...����P������.. */
+	$"0000 000F CCCC CC50 56CC CCCC CF00 0000"            /* ....���PV����... */
+	$"0000 0000 FCCC CCD0 5CCC CCCC F000 0000"            /* ....����\����... */
+	$"0000 0000 0FCC CCD0 DCCC CCCF 0000 0000"            /* .....�������.... */
+	$"0000 0000 00FC CCD0 DCCC CCF0 0000 0000"            /* .....�������.... */
+	$"0000 0000 000F CCD0 DCCC CF00 0000 0000"            /* ......�����..... */
+	$"0000 0000 0000 FCC0 CCCC F000 0000 0000"            /* ......�����..... */
+	$"0000 0000 0000 0FCD CCCF 0000 0000 0000"            /* .......���...... */
+	$"0000 0000 0000 00FC CCF0 0000 0000 0000"            /* .......���...... */
+	$"0000 0000 0000 000F CF00 0000 0000 0000"            /* ........�....... */
+	$"0000 0000 0000 0000 F000 0000 0000 0000"            /* ........�....... */
+	$"6963 6C38 0000 0408 0000 0000 0000 0000"            /* icl8............ */
+	$"0000 0000 0000 00FF 0000 0000 0000 0000"            /* .......�........ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 FF2B FF00 0000 0000 0000"            /* ......�+�....... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 00FF 2B2B 2BFF 7FEC 7F00 0000"            /* .....�+++�.�.... */
+	$"FFFF FFFF FF00 0000 0000 0000 0000 0000"            /* �����........... */
+	$"0000 0000 FF2B 2B2B 2BB0 B0EC 0000 0000"            /* ....�++++���.... */
+	$"FFC0 ECC0 FF00 0000 0000 0000 0000 0000"            /* �����........... */
+	$"0000 00FF 2B2B 2B2B B0EC ECFF 0000 0000"            /* ...�++++����.... */
+	$"FFEC C0EC FF00 0000 0000 0000 0000 0000"            /* �����........... */
+	$"0000 FF2B 2B2B 2BB0 ECFF B02B FF00 0000"            /* ..�++++����+�... */
+	$"FFC0 ECC0 FF00 0000 0000 0000 0000 0000"            /* �����........... */
+	$"00FF 2B2B 2B2B ECEC ECEC 2B2B 00FF 0000"            /* .�++++����++.�.. */
+	$"FFEC C0EC FF00 0000 0000 0000 0000 0000"            /* �����........... */
+	$"FF2B 2B2B 2B2B F9B0 B0EC ECEC FF2B FF00"            /* �+++++�������+�. */
+	$"FFC0 ECC0 FF00 0000 0000 0000 0000 00FF"            /* �����..........� */
+	$"2B2B 2B2B 2BEC B0EC B0EC ECC0 2B2B 2BFF"            /* +++++�����+++� */
+	$"FFEC C0EC FF00 0000 0000 0000 0000 FF2B"            /* �����.........�+ */
+	$"2B2B 2B2B 2BEC FCB0 B0B0 ECEC 2B2B 2B2B"            /* +++++�������++++ */
+	$"FFC0 ECC0 FF00 0000 0000 0000 00FF 2B2B"            /* �����........�++ */
+	$"2B2B 2B2B 2BEC B0EC B0EC B0C0 2BFF FFFF"            /* +++++����+��� */
+	$"FFEC C0EC FFFF FFFF 0000 0000 FF2B 2B2B"            /* ��������....�+++ */
+	$"2B2B 2B2B 2BEC FCB0 B0EC B02B 2B2B FFC0"            /* +++++�����+++�� */
+	$"ECC0 ECC0 ECC0 FF00 0000 00FF 2B2B 2B2B"            /* �������....�++++ */
+	$"2B2B 2B2B 2BEC B0B0 B0EC B02B 2B2B 2BFF"            /* +++++찰��++++� */
+	$"C0EC C0EC C0FF 0000 0000 FF2B 2B2B 2B2B"            /* ������....�+++++ */
+	$"2B2B 2B2B C0EC EC00 B0B0 EC2B 2B2B 2B2B"            /* ++++���.���+++++ */
+	$"FFC0 ECC0 FF00 0000 00FF 2B2B 2B2B 2B2B"            /* �����....�++++++ */
+	$"2B2B 2B2B 2BF9 B0F9 B0EC C02B 2B2B 2B2B"            /* +++++������+++++ */
+	$"2BFF C0FF 2BFF 0000 FF2B 2B2B 2B2B 2B2B"            /* +���+�..�+++++++ */
+	$"2B2B 2B2B ECEC EC00 B0B0 EC2B 2B2B 2B2B"            /* ++++���.���+++++ */
+	$"2B2B FF2B 2B2B FF00 00FF 2B2B 2B2B 2B2B"            /* ++�+++�..�++++++ */
+	$"2B2B 2B2B ECEC B02B B0EC B02B 2B2B 2B2B"            /* ++++��+��+++++ */
+	$"2B2B 2B2B 2B2B 2BFF 0000 FF2B 2B2B 2B2B"            /* +++++++�..�+++++ */
+	$"2B2B 2B2B ECEC EC00 FCEC F92B 2B2B 2B2B"            /* ++++���.���+++++ */
+	$"2B2B 2B2B 2B2B FF00 0000 00FF 2B2B 2B2B"            /* ++++++�....�++++ */
+	$"2B2B 2B2B 2BEC B000 ECB0 EC2B 2B2B 2B2B"            /* +++++�.��+++++ */
+	$"2B2B 2B2B 2BFF 0000 0000 0000 FF2B 2B2B"            /* +++++�......�+++ */
+	$"2B2B 2B2B 2BEC FC2B B0FC 2B2B 2B2B 2B2B"            /* +++++��+��++++++ */
+	$"2B2B 2B2B FF00 0000 0000 0000 00FF 2B2B"            /* ++++�........�++ */
+	$"2B2B 2B2B 2BEC B000 B0EC EC2B 2B2B 2B2B"            /* +++++�.���+++++ */
+	$"2B2B 2BFF 0000 0000 0000 0000 0000 FF2B"            /* +++�..........�+ */
+	$"2B2B 2B2B 2B2B B000 7FB0 2B2B 2B2B 2B2B"            /* ++++++�..�++++++ */
+	$"2B2B FF00 0000 0000 0000 0000 0000 00FF"            /* ++�............� */
+	$"2B2B 2B2B 2B2B B000 B0EC 2B2B 2B2B 2B2B"            /* ++++++�.��++++++ */
+	$"2BFF 0000 0000 0000 0000 0000 0000 0000"            /* +�.............. */
+	$"FF2B 2B2B 2B2B F900 B02B 2B2B 2B2B 2B2B"            /* �+++++�.�+++++++ */
+	$"FF00 0000 0000 0000 0000 0000 0000 0000"            /* �............... */
+	$"00FF 2B2B 2B2B F900 F92B 2B2B 2B2B 2BFF"            /* .�++++�.�++++++� */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 FF2B 2B2B F900 F92B 2B2B 2B2B FF00"            /* ..�+++�.�+++++�. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 00FF 2B2B F900 F92B 2B2B 2BFF 0000"            /* ...�++�.�++++�.. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 FF2B 2B00 2B2B 2B2B FF00 0000"            /* ....�++.++++�... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 00FF 2BF9 2B2B 2BFF 0000 0000"            /* .....�+�+++�.... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 FF2B 2B2B FF00 0000 0000"            /* ......�+++�..... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 00FF 2BFF 0000 0000 0000"            /* .......�+�...... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 FF00 0000 0000 0000"            /* ........�....... */
+	$"0000 0000 0000 0000"                                /* ........ */
+};