Rest of the updated files for the MAC_OSX_TCL -> MAC_OSX_TK conversion.

10 files changed, 168 insertions, 98 deletions

diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 0e60d50..7bc447d 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -9,13 +9,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGrab.c,v 1.6.6.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkGrab.c,v 1.6.6.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 #include "tkPort.h"
 #include "tkInt.h"
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
 #include "tkUnixInt.h"
 #endif
 
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index a137ec4..90cb8ba 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPointer.c,v 1.4.18.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkPointer.c,v 1.4.18.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 #include "tkInt.h"
@@ -20,7 +20,7 @@
 #include "tkWinInt.h"
 #endif
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #define Cursor XCursor
 #endif
 
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index 589fc11..e52187d 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkSelect.c,v 1.7.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkSelect.c,v 1.7.2.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 #include "tkInt.h"
@@ -1195,7 +1195,7 @@ TkSelInit(tkwin)
      *    http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11
      */
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
     dispPtr->utf8Atom		= Tk_InternAtom(tkwin, "UTF8_STRING");
 #else
     dispPtr->utf8Atom		= (Atom) NULL;
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 277f0c9..1e1cf94 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,13 +8,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.28.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.28.2.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 #include "tkInt.h"
 #include "tkPort.h"
 
-#if !(defined(__WIN32__) && defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) && defined(MAC_TCL) || defined(MAC_OSX_TK))
 /* UNIX */
 #define UNIX_TK
 #endif
@@ -28,9 +28,8 @@
 #include "tkMacInt.h"
 #endif
 
-#if defined(MAC_OSX_TCL)
+#if defined(MAC_OSX_TK)
 /* set this locally .. we could have used _TKMACINT */
-#define MAC_OSX_TK
 #include "tkMacOSXInt.h"
 #endif
 
@@ -173,7 +172,7 @@ TkIntStubs tkIntStubs = {
     TkpGetSubFonts, /* 110 */
     TkpGetSystemDefault, /* 111 */
     TkpMenuThreadInit, /* 112 */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 113 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -183,9 +182,12 @@ TkIntStubs tkIntStubs = {
     TkClipBox, /* 113 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkClipBox, /* 113 */
+    NULL, /* 113 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkClipBox, /* 113 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 114 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -195,9 +197,12 @@ TkIntStubs tkIntStubs = {
     TkCreateRegion, /* 114 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkCreateRegion, /* 114 */
+    NULL, /* 114 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkCreateRegion, /* 114 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 115 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -207,9 +212,12 @@ TkIntStubs tkIntStubs = {
     TkDestroyRegion, /* 115 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkDestroyRegion, /* 115 */
+    NULL, /* 115 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkDestroyRegion, /* 115 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 116 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -219,9 +227,12 @@ TkIntStubs tkIntStubs = {
     TkIntersectRegion, /* 116 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkIntersectRegion, /* 116 */
+    NULL, /* 116 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkIntersectRegion, /* 116 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 117 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -231,9 +242,12 @@ TkIntStubs tkIntStubs = {
     TkRectInRegion, /* 117 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkRectInRegion, /* 117 */
+    NULL, /* 117 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkRectInRegion, /* 117 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 118 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -243,9 +257,12 @@ TkIntStubs tkIntStubs = {
     TkSetRegion, /* 118 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkSetRegion, /* 118 */
+    NULL, /* 118 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkSetRegion, /* 118 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 119 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -255,9 +272,12 @@ TkIntStubs tkIntStubs = {
     TkUnionRectWithRegion, /* 119 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkUnionRectWithRegion, /* 119 */
+    NULL, /* 119 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkUnionRectWithRegion, /* 119 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 120 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -269,7 +289,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkGenerateActivateEvents, /* 120 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 121 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -281,7 +301,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkpCreateNativeBitmap, /* 121 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 122 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -293,7 +313,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkpDefineNativeBitmaps, /* 122 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 123 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -305,7 +325,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkpGetMS, /* 123 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 124 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -317,7 +337,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkpGetNativeAppBitmap, /* 124 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 125 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -329,7 +349,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkPointerDeadWindow, /* 125 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 126 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -341,7 +361,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkpSetCapture, /* 126 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 127 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -353,7 +373,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkpSetCursor, /* 127 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 128 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -366,7 +386,7 @@ TkIntStubs tkIntStubs = {
     TkpWmSetState, /* 128 */
 #endif /* MAC_OSX_TCL */
     NULL, /* 129 */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 130 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -378,7 +398,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkGetTransientMaster, /* 130 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 131 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -391,7 +411,7 @@ TkIntStubs tkIntStubs = {
     TkGenerateButtonEvent, /* 131 */
 #endif /* MAC_OSX_TCL */
     NULL, /* 132 */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 133 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -403,7 +423,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_OSX_TCL
     TkGenWMDestroyEvent, /* 133 */
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     NULL, /* 134 */
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -426,7 +446,7 @@ TkIntStubs tkIntStubs = {
 TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
     NULL,
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     TkCreateXEventSource, /* 0 */
     TkFreeWindowId, /* 1 */
     TkInitXId, /* 2 */
@@ -541,7 +561,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkMacGetHostToplevel, /* 64 */
     TkMacPreprocessMenu, /* 65 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
     TkGenerateActivateEvents, /* 0 */
     TkpCreateNativeBitmap, /* 1 */
     TkpDefineNativeBitmaps, /* 2 */
@@ -590,7 +610,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXPreprocessMenu, /* 45 */
     TkpIsWindowFloating, /* 46 */
     TkMacOSXGetCapture, /* 47 */
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 };
 
 TkIntXlibStubs tkIntXlibStubs = {
@@ -797,7 +817,7 @@ TkIntXlibStubs tkIntXlibStubs = {
     XQueryColor, /* 88 */
     XQueryColors, /* 89 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
     XCreateImage, /* 2 */
@@ -888,7 +908,7 @@ TkIntXlibStubs tkIntXlibStubs = {
     XWarpPointer, /* 87 */
     XQueryColor, /* 88 */
     XQueryColors, /* 89 */
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 };
 
 TkPlatStubs tkPlatStubs = {
@@ -915,7 +935,7 @@ TkPlatStubs tkPlatStubs = {
     TkMacHaveAppearance, /* 9 */
     TkMacGetDrawablePort, /* 10 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
     Tk_MacOSXSetEmbedHandler, /* 0 */
     Tk_MacOSXTurnOffMenus, /* 1 */
     Tk_MacOSXTkOwnsCursor, /* 2 */
@@ -928,7 +948,7 @@ TkPlatStubs tkPlatStubs = {
     Tk_MacOSXOpenBundleResources, /* 9 */
     Tk_MacOSXSetupTkNotifier, /* 10 */
     Tk_MacOSXIsAppInFront, /* 11 */
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 };
 
 static TkStubHooks tkStubHooks = {
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index 328feac..a7d10ac 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubLib.c,v 1.6.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.6.2.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 /*
@@ -20,11 +20,11 @@
 
 #if defined(MAC_TCL)
 #include "tkMacInt.h"
-#else defined(MAC_OSX_TCL)
+#else defined(MAC_OSX_TK)
 #include "tkMacOSXInt.h"
 #endif
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #include "tkInt.h"
 #include "tkPort.h"
 #endif /* MAC_TCL */
@@ -46,7 +46,7 @@
 #endif
 #undef USE_TK_STUB_PROCS
 
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TCL)
+#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
 
 #include "tkPort.h"
 #include "tkInt.h"
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 586e9e5..41976c3 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTest.c,v 1.15.6.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkTest.c,v 1.15.6.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 #include "tkInt.h"
@@ -24,7 +24,7 @@
 #include "tkWinInt.h"
 #endif
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #include "tkScrollbar.h"
 #endif
 
@@ -181,7 +181,7 @@ static int		TestmakeexistCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, char **argv));
 static int		TestmenubarCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, char **argv));
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
 static int		TestmetricsCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, char **argv));
 #endif
@@ -205,7 +205,7 @@ static int		TestsendCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, char **argv));
 static int		TesttextCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, char **argv));
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
 static int		TestwrapperCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, char **argv));
 #endif
@@ -224,7 +224,7 @@ static void		TrivialEventProc _ANSI_ARGS_((ClientData clientData,
 extern int		TkplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp));
 extern int              TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp));
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
 #define TkplatformtestInit(x) TCL_OK
 #endif
 
@@ -284,7 +284,7 @@ Tktest_Init(interp)
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand(interp, "testmenubar", TestmenubarCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
     Tcl_CreateCommand(interp, "testmetrics", TestmetricsCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
 #endif
@@ -294,7 +294,7 @@ Tktest_Init(interp)
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand(interp, "testtext", TesttextCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
     Tcl_CreateCommand(interp, "testwrapper", TestwrapperCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
 #endif
@@ -2057,7 +2057,7 @@ TestmetricsCmd(clientData, interp, argc, argv)
     return TCL_OK;
 }
 #endif
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 static int
 TestmetricsCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Main window for application. */
@@ -2198,7 +2198,7 @@ TestsendCmd(clientData, interp, argc, argv)
     int argc;				/* Number of arguments. */
     char **argv;			/* Argument strings. */
 {
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
     TkWindow *winPtr = (TkWindow *) clientData;
 #endif
 
@@ -2208,7 +2208,7 @@ TestsendCmd(clientData, interp, argc, argv)
 	return TCL_ERROR;
     }
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
     if (strcmp(argv[1], "bogus") == 0) {
 	XChangeProperty(winPtr->dispPtr->display,
 		RootWindow(winPtr->dispPtr->display, 0),
@@ -2360,7 +2360,7 @@ TesttextCmd(clientData, interp, argc, argv)
     return TCL_OK;
 }
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
 /*
  *----------------------------------------------------------------------
  *
diff --git a/generic/tkText.c b/generic/tkText.c
index cf8b9ae..cd2c64b 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -14,14 +14,14 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkText.c,v 1.18.4.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.18.4.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 #include "default.h"
 #include "tkPort.h"
 #include "tkInt.h"
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #define Style TkStyle
 #define DInfo TkDInfo
 #endif
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 3b51586..f0482e1 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -12,13 +12,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWindow.c,v 1.39.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.39.2.2 2001/10/17 07:10:46 wolfsuit Exp $
  */
 
 #include "tkPort.h"
 #include "tkInt.h"
 
-#if !( defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))
+#if !( defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
 #include "tkUnixInt.h"
 #endif
 
@@ -116,7 +116,7 @@ static TkCmd commands[] = {
     {"selection",	NULL,			Tk_SelectionObjCmd,	0, 1},
     {"tk",		NULL,			Tk_TkObjCmd,		0, 1},
     {"tkwait",		NULL,			Tk_TkwaitObjCmd,	1, 1},
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
     {"tk_chooseColor",  NULL,			Tk_ChooseColorObjCmd,	0, 1},
     {"tk_chooseDirectory", NULL,		Tk_ChooseDirectoryObjCmd, 0, 1},
     {"tk_getOpenFile",  NULL,			Tk_GetOpenFileObjCmd,	0, 1},
@@ -154,7 +154,7 @@ static TkCmd commands[] = {
      * Misc.
      */
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
     {"::tk::unsupported::MacWindowStyle",
 	    		TkUnsupported1Cmd,	NULL,			1, 1},
 #endif
@@ -1349,7 +1349,7 @@ Tk_DestroyWindow(tkwin)
 	TkWmRemoveFromColormapWindows(winPtr);
     }
     if (winPtr->window != None) {
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL) || defined(__WIN32__)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK) || defined(__WIN32__)
 	XDestroyWindow(winPtr->display, winPtr->window);
 #else
 	if ((winPtr->flags & TK_TOP_LEVEL)
@@ -1990,7 +1990,7 @@ Tk_DefineCursor(tkwin, cursor)
 {
     register TkWindow *winPtr = (TkWindow *) tkwin;
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
     winPtr->atts.cursor = (XCursor) cursor;
 #else
     winPtr->atts.cursor = (Cursor) cursor;
diff --git a/macosx/Wish.pbproj/jingham.pbxuser b/macosx/Wish.pbproj/jingham.pbxuser
index 1ff37e1..bb7890e 100644
--- a/macosx/Wish.pbproj/jingham.pbxuser
+++ b/macosx/Wish.pbproj/jingham.pbxuser
@@ -1,7 +1,7 @@
 // !$*UTF8*$!
 {
 	F537552A016C352C01DC9062 = {
-		activeBuildStyle = F537552D016C352C01DC9062;
+		activeBuildStyle = F537552C016C352C01DC9062;
 		activeTarget = F53756A0016C4DD401DC9062;
 		addToTargets = (
 			F53755DF016C38D201DC9062,
@@ -11,72 +11,72 @@
 			F5B2CDC10175829501DC9062,
 			F571FE470179562E01DC9062,
 			F571FE4A0179695001DC9062,
-			F571FE4B01796A1201DC9062,
 			F571FE4C01796B1101DC9062,
 			F571FE4D01796CAF01DC9062,
 			F571FE4E01796F9201DC9062,
 			F571FE4F0179702301DC9062,
 			F571FE500179702301DC9062,
+			F5D47B92017C934C01DC9062,
 		);
 		perUserDictionary = {
 			PBXWorkspaceConfiguration = {
-				ContentSize = "{938, 678}";
+				ContentSize = "{838, 674}";
 				LeftSlideOut = {
 					ActiveTab = 0;
-					Frame = "{{0, 23}, {938, 655}}";
+					Frame = "{{0, 23}, {838, 651}}";
 					Split0 = {
-						ActiveTab = 3;
-						Frame = "{{322, 0}, {616, 655}}";
+						ActiveTab = 1;
+						Frame = "{{322, 0}, {516, 651}}";
 						Split0 = {
-							Frame = "{{0, 320}, {616, 335}}";
+							Frame = "{{0, 158}, {516, 493}}";
 						};
 						SplitCount = 1;
 						Tab0 = {
 							Debugger = {
-								ActiveTab = 0;
-								Frame = "{{0, 0}, {663, 264}}";
+								ActiveTab = 1;
+								Frame = "{{0, 0}, {616, 264}}";
 								Split0 = {
-									Frame = "{{0, 207}, {663, 57}}";
+									Frame = "{{0, 263}, {616, 1}}";
 									Split0 = {
-										Frame = "{{0, 0}, {175, 57}}";
+										Frame = "{{0, 0}, {162, 1}}";
 									};
 									Split1 = {
-										Frame = "{{184, 0}, {479, 57}}";
+										Frame = "{{171, 0}, {445, 1}}";
 									};
 									SplitCount = 2;
 								};
 								SplitCount = 1;
 								Tab0 = {
-									Frame = "{{0, 0}, {663, 182}}";
+									Frame = "{{0, 0}, {616, 112}}";
 								};
 								Tab1 = {
 									Frame = "{{0, 0}, {616, 238}}";
 								};
 								TabCount = 2;
 							};
-							Frame = "{{0, 0}, {663, 264}}";
+							Frame = "{{0, 0}, {616, 264}}";
 							LauncherConfigVersion = 4;
 						};
 						Tab1 = {
-							Frame = "{{0, 0}, {615, 133}}";
+							Frame = "{{0, 0}, {516, 133}}";
 							LauncherConfigVersion = 3;
 							Runner = {
-								Frame = "{{0, 0}, {615, 133}}";
+								Frame = "{{0, 0}, {516, 133}}";
 							};
 						};
 						Tab2 = {
-							BuildMessageFrame = "{{0, 0}, {618, 47}}";
-							BuildTranscriptFrame = "{{0, 56}, {618, 132}}";
-							Frame = "{{0, 0}, {616, 186}}";
+							BuildMessageFrame = "{{0, 0}, {518, 53}}";
+							BuildTranscriptFrame = "{{0, 62}, {518, 126}}";
+							Frame = "{{0, 0}, {516, 186}}";
 						};
 						Tab3 = {
-							Frame = "{{0, 0}, {616, 295}}";
+							Frame = "{{0, 0}, {713, 295}}";
 						};
 						TabCount = 4;
 					};
 					SplitCount = 1;
 					Tab0 = {
-						Frame = "{{0, 0}, {297, 655}}";
+						Frame = "{{0, 0}, {297, 651}}";
 					};
 					Tab1 = {
 						ClassesFrame = "{{0, 0}, {202, 56}}";
@@ -88,12 +88,12 @@
 						Frame = "{{0, 0}, {200, 644}}";
 					};
 					Tab3 = {
-						Frame = "{{0, 0}, {200, 644}}";
+						Frame = "{{0, 0}, {200, 651}}";
 						Split0 = {
 							Frame = "{{0, 0}, {200, 312}}";
 						};
 						Split1 = {
-							Frame = "{{0, 321}, {200, 323}}";
+							Frame = "{{0, 321}, {200, 330}}";
 						};
 						SplitCount = 2;
 					};
@@ -149,12 +149,6 @@
 		lineNumber = 176;
 		state = 2;
 	};
-	F571FE4B01796A1201DC9062 = {
-		fileReference = F5375548016C376E01DC9062;
-		isa = PBXFileBreakpoint;
-		lineNumber = 278;
-		state = 2;
-	};
 	F571FE4C01796B1101DC9062 = {
 		fileReference = F5375558016C376E01DC9062;
 		isa = PBXFileBreakpoint;
@@ -191,4 +185,10 @@
 		lineNumber = 2584;
 		state = 2;
 	};
+	F5D47B92017C934C01DC9062 = {
+		fileReference = F5375548016C376E01DC9062;
+		isa = PBXFileBreakpoint;
+		lineNumber = 275;
+		state = 1;
+	};
 }
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index 8bb58f6..cf09108 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -21,6 +21,7 @@
 		};
 		F537552B016C352C01DC9062 = {
 			children = (
+				F5C88659017D625C01DC9062,
 				F5DF07A7016CD03801DC9062,
 				F5375688016C3F1001DC9062,
 				F5375531016C376E01DC9062,
@@ -1243,7 +1244,7 @@
 				INSTALL_PATH = /Library/Frameworks;
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DMAC_OSX_TCL -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1";
+				OTHER_CFLAGS = "-DMAC_OSX_TCL -DMAC_OSX_TK -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1";
 				OTHER_LDFLAGS = "-seg1addr 0x350000";
 				OTHER_LIBTOOL_FLAGS = "";
 				OTHER_REZFLAGS = "-i \"../../tcl/generic\" -i \"../generic\"";
@@ -1354,6 +1355,8 @@ Copyright Apple Computer, Inc 2001</string>
 		F53755E1016C38D301DC9062 = {
 			buildActionMask = 2147483647;
 			files = (
+				F5C8865C017D625C01DC9062,
+				F5C8865D017D625C01DC9062,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -2602,7 +2605,7 @@ Copyright Apple Computer, Inc 2001</string>
 				HEADER_SEARCH_PATHS = "../../tcl/generic ../../tcl/unix ../generic ../xlib";
 				LIBRARY_SEARCH_PATHS = "\"${BUILD_ROOT}/tcl\"";
 				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DMAC_OSX_TCL -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1";
+				OTHER_CFLAGS = "-DMAC_OSX_TCL -DMAC_OSX_TK -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "-i \"../../tcl/generic\" -i \"../generic\"";
 				PRODUCT_NAME = "Wish Shell";
@@ -2666,6 +2669,8 @@ Copyright Apple Computer, Inc 2001</string>
 			buildActionMask = 2147483647;
 			files = (
 				F53756A3016C4DD401DC9062,
+				F5C8865E017D625C01DC9062,
+				F5C8865F017D625C01DC9062,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -2990,6 +2995,51 @@ Copyright Apple Computer, Inc 2001</string>
 			settings = {
 			};
 		};
+		F5C88659017D625C01DC9062 = {
+			children = (
+				F5C8865A017D625C01DC9062,
+				F5C8865B017D625C01DC9062,
+			);
+			isa = PBXGroup;
+			name = "Header Tools";
+			refType = 4;
+		};
+		F5C8865A017D625C01DC9062 = {
+			isa = PBXFileReference;
+			name = tk.decls;
+			path = /Volumes/CodeBits/jingham/Tcl/source/tk/generic/tk.decls;
+			refType = 0;
+		};
+		F5C8865B017D625C01DC9062 = {
+			isa = PBXFileReference;
+			name = tkInt.decls;
+			path = /Volumes/CodeBits/jingham/Tcl/source/tk/generic/tkInt.decls;
+			refType = 0;
+		};
+		F5C8865C017D625C01DC9062 = {
+			fileRef = F5C8865A017D625C01DC9062;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5C8865D017D625C01DC9062 = {
+			fileRef = F5C8865B017D625C01DC9062;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5C8865E017D625C01DC9062 = {
+			fileRef = F5C8865A017D625C01DC9062;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F5C8865F017D625C01DC9062 = {
+			fileRef = F5C8865B017D625C01DC9062;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F5DF07A7016CD03801DC9062 = {
 			children = (
 				F5DF0928016CD3F901DC9062,