Replace MAC_OSX_TCL with MAC_OSX_TK for all windowing specific things. This is so we can separate the macosx specific additions to Tcl (which are added ON to the Unix core) from the Aqua additions (which are orthogonal to Unix - which itself is overloaded to mean X11 as well...)

17 files changed, 289 insertions, 268 deletions

diff --git a/generic/default.h b/generic/default.h
index 6c285df..946767b 100644
--- a/generic/default.h
+++ b/generic/default.h
@@ -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: default.h,v 1.3.2.1 2001/10/15 09:21:59 wolfsuit Exp $
+ * RCS: @(#) $Id: default.h,v 1.3.2.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #ifndef _DEFAULT
@@ -20,7 +20,7 @@
     defined(__CYGWIN__) || defined(__MINGW32__)
 #   include "tkWinDefault.h"
 #else
-#   if defined(MAC_OSX_TCL)
+#   if defined(MAC_OSX_TK)
 #	include "tkMacOSXDefault.h"
 #   elif defined(MAC_TCL)
 #       include "tkMacDefault.h"
diff --git a/generic/tk.decls b/generic/tk.decls
index bcae238..5308acb 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -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: tk.decls,v 1.15.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+# RCS: @(#) $Id: tk.decls,v 1.15.2.2 2001/10/17 07:02:06 wolfsuit Exp $
 
 library tk
 
@@ -1247,7 +1247,7 @@ declare 10 mac {
 
 # Mac OS X specific functions
 
-declare 0 macosx {
+declare 0 aqua {
     void Tk_MacOSXSetEmbedHandler ( \
 	    Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, \
 	    Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, \
@@ -1256,40 +1256,40 @@ declare 0 macosx {
 	    Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)
 }
  
-declare 1 macosx {
+declare 1 aqua {
     void Tk_MacOSXTurnOffMenus (void)
 }
 
-declare 2 macosx {
+declare 2 aqua {
     void Tk_MacOSXTkOwnsCursor (int tkOwnsIt)
 }
 
-declare 3 macosx {
+declare 3 aqua {
     void TkMacOSXInitMenus (Tcl_Interp *interp)
 }
 
-declare 4 macosx {
+declare 4 aqua {
     void TkMacOSXInitAppleEvents (Tcl_Interp *interp)
 }
 
-declare 5 macosx {
+declare 5 aqua {
     void TkGenWMConfigureEvent (Tk_Window tkwin, \
 	    int x, int y, int width, int height, int flags)
 }
 
-declare 6 macosx {
+declare 6 aqua {
     void TkMacOSXInvalClipRgns (TkWindow *winPtr)
 }
 
-declare 7 macosx {
+declare 7 aqua {
     GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable)
 }
 
-declare 8 macosx {
+declare 8 aqua {
     ControlRef TkMacOSXGetRootControl (Drawable drawable)
 }
 
-declare 9 macosx {
+declare 9 aqua {
     int Tk_MacOSXOpenBundleResources (Tcl_Interp *interp, \
         char *bundleName, \
         char *libraryPath, \
@@ -1297,10 +1297,10 @@ declare 9 macosx {
         int hasResourceFile)
 }
 
-declare 10 macosx {
+declare 10 aqua {
     void Tk_MacOSXSetupTkNotifier (void)
 }
 
-declare 11 macosx {
+declare 11 aqua {
     int Tk_MacOSXIsAppInFront (void)
 }
\ No newline at end of file
diff --git a/generic/tk.h b/generic/tk.h
index 8c8ffa9..faf8152 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk.h,v 1.57.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tk.h,v 1.57.2.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #ifndef _TK
@@ -58,7 +58,7 @@ extern "C" {
  * compilers.  We use this method because there is no autoconf equivalent.
  */
 
-#if  defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if  defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   ifndef REDO_KEYSYM_LOOKUP
 #	define REDO_KEYSYM_LOOKUP
 #   endif
@@ -79,7 +79,7 @@ extern "C" {
 #   if defined (MAC_TCL)
 #      include <Xlib.h>
 #      include <X.h>
-#   elif defined(MAC_OSX_TCL)
+#   elif defined(MAC_OSX_TK)
 #	include <X11/Xlib.h>
 #	include <X11/X.h>
 #   else
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 9c2b20e..d6df238 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.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: tkBind.c,v 1.18.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ *  RCS: @(#) $Id: tkBind.c,v 1.18.2.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #include "tkPort.h"
@@ -21,7 +21,7 @@
 #include "tkWinInt.h"
 #endif
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL)) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* UNIX */
 #include "tkUnixInt.h"
 #endif
 
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index db2a4cb..30f9137 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.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: tkCmds.c,v 1.20.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.20.2.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #include "tkPort.h"
@@ -22,7 +22,7 @@
 #include "tkWinInt.h"
 #elif defined(MAC_TCL)
 #include "tkMacInt.h"
-#elif defined(MAC_OSX_TCL) 
+#elif defined(MAC_OSX_TK) 
 #include "tkMacOSXInt.h"
 #else
 #include "tkUnixInt.h"
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 58310ba..02de437 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -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: tkInt.decls,v 1.21.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.21.2.2 2001/10/17 07:02:06 wolfsuit Exp $
 
 library tk
 
@@ -526,32 +526,32 @@ declare 112 generic {
     void TkpMenuThreadInit (void)
 }
 
-declare 113 {mac macosx win}  {
+declare 113 {mac aqua win}  {
     void TkClipBox (TkRegion rgn, XRectangle* rect_return)
 }
 
-declare 114 {mac macosx win}  {
+declare 114 {mac aqua win}  {
     TkRegion TkCreateRegion (void)
 }
 
-declare 115 {mac macosx win} {
+declare 115 {mac aqua win} {
     void TkDestroyRegion (TkRegion rgn)
 }
 
-declare 116 {mac macosx win} {
+declare 116 {mac aqua win} {
     void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return)
 }
 
-declare 117 {mac macosx win} {
+declare 117 {mac aqua win} {
     int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \
 	    unsigned int height)
 }
 
-declare 118 {mac macosx win} {
+declare 118 {mac aqua win} {
     void TkSetRegion (Display* display, GC gc, TkRegion rgn)
 }
 
-declare 119 {mac macosx win} {
+declare 119 {mac aqua win} {
     void TkUnionRectWithRegion (XRectangle* rect, \
 	    TkRegion src, TkRegion dr_return)
 }
@@ -1059,196 +1059,196 @@ declare 65 mac {
 ########################
 # Mac OS X specific functions
 
-declare 0 macosx {
+declare 0 aqua {
     void TkGenerateActivateEvents (TkWindow *winPtr, int active)
 }
 
-declare 1 macosx {
+declare 1 aqua {
     Pixmap TkpCreateNativeBitmap (Display *display, char * source)
 }
 
-declare 2 macosx {
+declare 2 aqua {
     void TkpDefineNativeBitmaps (void)
 }
 
-declare 3 macosx {
+declare 3 aqua {
     void TkPointerDeadWindow (TkWindow *winPtr)
 }
 
-declare 4 macosx {
+declare 4 aqua {
     void TkpSetCapture (TkWindow *winPtr)
 }
 
-declare 5 macosx {
+declare 5 aqua {
     void TkpSetCursor (TkpCursor cursor)
 }
 
-declare 6 macosx {
+declare 6 aqua {
     void TkpWmSetState (TkWindow *winPtr, int state)
 }
 
-declare 7 macosx {
+declare 7 aqua {
     void   TkAboutDlg (void)
 }
 
-declare 8 macosx {
+declare 8 aqua {
     unsigned int TkMacOSXButtonKeyState (void)
 }
 
-declare 9 macosx {
+declare 9 aqua {
     void  TkMacOSXClearMenubarActive (void)
 }
 
-declare 10 macosx {
+declare 10 aqua {
     int  TkMacOSXDispatchMenuEvent (int menuID, int index)
 }
 
-declare 11 macosx {
+declare 11 aqua {
     void  TkMacOSXInstallCursor (int resizeOverride)
 }
 
-declare 12 macosx {
+declare 12 aqua {
     void  TkMacOSXHandleTearoffMenu (void)
 }
 
-declare 13 macosx {
+declare 13 aqua {
     void  TkMacOSXInvalClipRgns (TkWindow *winPtr)
 }
 
-declare 14 macosx {
+declare 14 aqua {
     int  TkMacOSXDoHLEvent (EventRecord *theEvent)
 }
 
-declare 15 macosx {
+declare 15 aqua {
     GWorldPtr  TkMacOSXGetDrawablePort (Drawable drawable)
 }
 
-declare 16 macosx {
+declare 16 aqua {
     Window   TkMacOSXGetXWindow (WindowRef macWinPtr)
 }
 
-declare 17 macosx {
+declare 17 aqua {
     int  TkMacOSXGrowToplevel (WindowRef whichWindow, Point start)
 }
 
-declare 18 macosx {
+declare 18 aqua {
     void   TkMacOSXHandleMenuSelect (long mResult, int optionKeyPressed)
 }
 
-declare 19 macosx {
+declare 19 aqua {
     void  TkMacOSXInitAppleEvents (Tcl_Interp *interp)
 }
 
-declare 20 macosx {
+declare 20 aqua {
     void   TkMacOSXInitMenus (Tcl_Interp  *interp)
 }
 
-declare 21 macosx {
+declare 21 aqua {
     void  TkMacOSXInvalidateWindow (MacDrawable *macWin, int flag)
 }
 
-declare 22 macosx {
+declare 22 aqua {
     int  TkMacOSXIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar)
 }
 
-declare 23 macosx {
+declare 23 aqua {
     void  TkMacOSXMakeRealWindowExist (TkWindow *winPtr)
 }
 
-declare 24 macosx {
+declare 24 aqua {
     BitMapPtr TkMacOSXMakeStippleMap(Drawable d1, Drawable d2)
 }
 
-declare 25 macosx {
+declare 25 aqua {
     void  TkMacOSXMenuClick (void)
 }
 
-declare 26 macosx {
+declare 26 aqua {
     void  TkMacOSXRegisterOffScreenWindow (Window window, GWorldPtr portPtr)
 }
 
-declare 27 macosx {
+declare 27 aqua {
     int  TkMacOSXResizable (TkWindow *winPtr)
 }
 
-declare 28 macosx {
+declare 28 aqua {
     void  TkMacOSXSetHelpMenuItemCount (void)
 }
 
-declare 29 macosx {
+declare 29 aqua {
     void  TkMacOSXSetScrollbarGrow (TkWindow *winPtr, int flag)
 }
 
-declare 30 macosx {
+declare 30 aqua {
     void  TkMacOSXSetUpClippingRgn (Drawable drawable)
 }
 
-declare 31 macosx {
+declare 31 aqua {
     void  TkMacOSXSetUpGraphicsPort (GC gc, GWorldPtr destPort)
 }
 
-declare 32 macosx {
+declare 32 aqua {
     void   TkMacOSXUpdateClipRgn (TkWindow *winPtr)
 }
 
-declare 33 macosx {
+declare 33 aqua {
     void  TkMacOSXUnregisterMacWindow (WindowRef portPtr)
 }
 
-declare 34 macosx {
+declare 34 aqua {
     int  TkMacOSXUseMenuID (short macID)
 }
 
-declare 35 macosx {
+declare 35 aqua {
     RgnHandle  TkMacOSXVisableClipRgn (TkWindow *winPtr)
 }
 
-declare 36 macosx {
+declare 36 aqua {
     void  TkMacOSXWinBounds (TkWindow *winPtr, Rect *geometry)
 }
 
-declare 37 macosx {
+declare 37 aqua {
     void  TkMacOSXWindowOffset (WindowRef wRef, int *xOffset, int *yOffset)
 }
 
-declare 38 macosx {
+declare 38 aqua {
     int   TkSetMacColor (unsigned long pixel, RGBColor *macColor)
 }
 
-declare 39 macosx {
+declare 39 aqua {
     void   TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid)
 }
 
-declare 40 macosx {
+declare 40 aqua {
     void  TkSuspendClipboard (void)
 }
 
-declare 41 macosx {
+declare 41 aqua {
     int  TkMacOSXZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart)
 }
 
-declare 42 macosx {
+declare 42 aqua {
     Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \
 	    int rootX, int rootY, int *newX, int *newY)
 }
 
-declare 43 macosx {
+declare 43 aqua {
     MacDrawable * TkMacOSXContainerId (TkWindow *winPtr)
 }
 
-declare 44 macosx {
+declare 44 aqua {
     MacDrawable * TkMacOSXGetHostToplevel  (TkWindow *winPtr)
 }
 
-declare 45 macosx {
+declare 45 aqua {
     void TkMacOSXPreprocessMenu (void)
 }
 
-declare 46 macosx {
+declare 46 aqua {
     int  TkpIsWindowFloating (WindowRef window)
 }
 
-declare 47 macosx {
+declare 47 aqua {
     Tk_Window TkMacOSXGetCapture (void)
 }
 
@@ -1742,409 +1742,409 @@ declare 105 win {
 	    unsigned int sw, unsigned int sh, int dx, int dy)
 }
 
-# X functions for Mac
+# X functions for Mac and Aqua
 
-declare 0 {mac macosx} {
+declare 0 {mac aqua} {
     void XSetDashes (Display* display, GC gc, int dash_offset,
 	    _Xconst char* dash_list, int n)
 }
 
-declare 1 {mac macosx} {
+declare 1 {mac aqua} {
     XModifierKeymap* XGetModifierMapping (Display* d)
 }
 
-declare 2 {mac macosx} {
+declare 2 {mac aqua} {
     XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \
 	    int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \
 	    int i4)
 
 }
 
-declare 3 {mac macosx} {
+declare 3 {mac aqua} {
     XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)
 }
 
-declare 4 {mac macosx} {
+declare 4 {mac aqua} {
     char *XGetAtomName (Display* d,Atom a)
 
 }
 
-declare 5 {mac macosx} {
+declare 5 {mac aqua} {
     char *XKeysymToString (KeySym k)
 }
 
-declare 6 {mac macosx} {
+declare 6 {mac aqua} {
     Colormap XCreateColormap (Display* d, Window w, Visual* v, int i)
 
 }
 
-declare 7 {mac macosx} {
+declare 7 {mac aqua} {
     GContext XGContextFromGC (GC g)
 }
 
-declare 8 {mac macosx} {
+declare 8 {mac aqua} {
     KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i)
 }
 
-declare 9 {mac macosx} {
+declare 9 {mac aqua} {
     KeySym XStringToKeysym (_Xconst char* c)
 }
 
-declare 10 {mac macosx} {
+declare 10 {mac aqua} {
     Window XRootWindow (Display* d, int i)
 }
 
-declare 11 {mac macosx} {
+declare 11 {mac aqua} {
     XErrorHandler XSetErrorHandler  (XErrorHandler x)
 }
 
-declare 12 {mac macosx} {
+declare 12 {mac aqua} {
     Status XAllocColor (Display* d, Colormap c, XColor* xp)
 }
 
-declare 13 {mac macosx} {
+declare 13 {mac aqua} {
     void XBell (Display* d, int i)
 }
 
-declare 14 {mac macosx} {
+declare 14 {mac aqua} {
     void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \
 	    int i2, _Xconst unsigned char* c, int i3)
 }
 
-declare 15 {mac macosx} {
+declare 15 {mac aqua} {
     void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \
 	    XSetWindowAttributes* x)
 }
 
-declare 16 {mac macosx} {
+declare 16 {mac aqua} {
     void XConfigureWindow (Display* d, Window w, unsigned int i, \
 	    XWindowChanges* x)
 }
 
-declare 17 {mac macosx} {
+declare 17 {mac aqua} {
     void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \
 	    int i2, unsigned int ui1, \
 	    unsigned int ui2, int i3, int i4)
 }
 
-declare 18 {mac macosx} {
+declare 18 {mac aqua} {
     void XCopyPlane (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \
 	    int i2, unsigned int ui1, \
 	    unsigned int ui2, int i3, int i4, unsigned long ul)
 }
 
-declare 19 {mac macosx} {
+declare 19 {mac aqua} {
     Pixmap XCreateBitmapFromData(Display* display, Drawable d, \
 	    _Xconst char* data, unsigned int width,unsigned int height)
 }
 
-declare 20 {mac macosx} {
+declare 20 {mac aqua} {
     void XDefineCursor (Display* d, Window w, Cursor c)
 }
 
-declare 21 {mac macosx} {
+declare 21 {mac aqua} {
     void XDestroyWindow (Display* d, Window w)
 }
 
-declare 22 {mac macosx} {
+declare 22 {mac aqua} {
     void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 
-declare 23 {mac macosx} {
+declare 23 {mac aqua} {
     void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)
 }
 
-declare 24 {mac macosx} {
+declare 24 {mac aqua} {
     void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 25 {mac macosx} {
+declare 25 {mac aqua} {
     void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 
-declare 26 {mac macosx} {
+declare 26 {mac aqua} {
     void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \
 	    int i1, int i2, int i3)
 }
 
-declare 27 {mac macosx} {
+declare 27 {mac aqua} {
     void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i)
 }
 
-declare 28 {mac macosx} {
+declare 28 {mac aqua} {
     void XFreeColormap (Display* d, Colormap c)
 }
 
-declare 29 {mac macosx} {
+declare 29 {mac aqua} {
     void XFreeColors (Display* d, Colormap c, \
 	    unsigned long* ulp, int i, unsigned long ul)
 }
 
-declare 30 {mac macosx} {
+declare 30 {mac aqua} {
     void XFreeModifiermap (XModifierKeymap* x)
 }
 
-declare 31 {mac macosx} {
+declare 31 {mac aqua} {
     Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \
 	    int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \
 	    unsigned int* ui4)
 }
 
-declare 32 {mac macosx} {
+declare 32 {mac aqua} {
     int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \
 	    Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \
 	    unsigned long* ulp2, unsigned char** cpp)
 }
 
-declare 33 {mac macosx} {
+declare 33 {mac aqua} {
     int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t)
 }
 
-declare 34 {mac macosx} {
+declare 34 {mac aqua} {
     int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \
 	    int i1, int i2, Window w2, Cursor c, Time t)
 }
 
-declare 35 {mac macosx} {
+declare 35 {mac aqua} {
     KeyCode XKeysymToKeycode (Display* d, KeySym k)
 }
 
-declare 36 {mac macosx} {
+declare 36 {mac aqua} {
     void XMapWindow (Display* d, Window w)
 }
 
-declare 37 {mac macosx} {
+declare 37 {mac aqua} {
     void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 38 {mac macosx} {
+declare 38 {mac aqua} {
     void XMoveWindow (Display* d, Window w, int i1, int i2)
 }
 
-declare 39 {mac macosx} {
+declare 39 {mac aqua} {
     Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \
 	    int* i1, int* i2, int* i3, int* i4, unsigned int* ui)
 }
 
-declare 40 {mac macosx} {
+declare 40 {mac aqua} {
     void XRaiseWindow (Display* d, Window w)
 }
 
-declare 41 {mac macosx} {
+declare 41 {mac aqua} {
     void XRefreshKeyboardMapping (XMappingEvent* x)
 }
 
-declare 42 {mac macosx} {
+declare 42 {mac aqua} {
     void XResizeWindow (Display* d, Window w, unsigned int ui1, \
 	    unsigned int ui2)
 }
 
-declare 43 {mac macosx} {
+declare 43 {mac aqua} {
     void XSelectInput (Display* d, Window w, long l)
 }
 
-declare 44 {mac macosx} {
+declare 44 {mac aqua} {
     Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x)
 }
 
-declare 45 {mac macosx} {
+declare 45 {mac aqua} {
     void XSetIconName (Display* d, Window w, _Xconst char* c)
 }
 
-declare 46 {mac macosx} {
+declare 46 {mac aqua} {
     void XSetInputFocus (Display* d, Window w, int i, Time t)
 }
 
-declare 47 {mac macosx} {
+declare 47 {mac aqua} {
     void XSetSelectionOwner (Display* d, Atom a, Window w, Time t)
 }
 
-declare 48 {mac macosx} {
+declare 48 {mac aqua} {
     void XSetWindowBackground (Display* d, Window w, unsigned long ul)
 }
 
-declare 49 {mac macosx} {
+declare 49 {mac aqua} {
     void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 50 {mac macosx} {
+declare 50 {mac aqua} {
     void XSetWindowBorder (Display* d, Window w, unsigned long ul)
 }
 
-declare 51 {mac macosx} {
+declare 51 {mac aqua} {
     void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 52 {mac macosx} {
+declare 52 {mac aqua} {
     void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui)
 }
 
-declare 53 {mac macosx} {
+declare 53 {mac aqua} {
     void XSetWindowColormap (Display* d, Window w, Colormap c)
 }
 
-declare 54 {mac macosx} {
+declare 54 {mac aqua} {
     void XUngrabKeyboard (Display* d, Time t)
 }
 
-declare 55 {mac macosx} {
+declare 55 {mac aqua} {
     void XUngrabPointer (Display* d, Time t) 
 }
 
-declare 56 {mac macosx} {
+declare 56 {mac aqua} {
     void XUnmapWindow (Display* d, Window w)
 }
 
-declare 57 {mac macosx} {
+declare 57 {mac aqua} {
     void TkPutImage (unsigned long *colors, \
 	    int ncolors, Display* display, Drawable d, \
 	    GC gc, XImage* image, int src_x, int src_y, \
 	    int dest_x, int dest_y, unsigned int width, \
 	    unsigned int height)
 } 
-declare 58 {mac macosx} {
+declare 58 {mac aqua} {
     Status XParseColor (Display *display, Colormap map, \
           _Xconst char* spec, XColor *colorPtr)
 }
 
-declare 59 {mac macosx} {
+declare 59 {mac aqua} {
     GC XCreateGC(Display* display, Drawable d, \
 	    unsigned long valuemask, XGCValues* values)
 }
 
-declare 60 {mac macosx} {
+declare 60 {mac aqua} {
     void XFreeGC(Display* display, GC gc)
 }
 
-declare 61 {mac macosx} {
+declare 61 {mac aqua} {
     Atom XInternAtom(Display* display,_Xconst char* atom_name, \
 	    Bool only_if_exists)
 }
 
-declare 62 {mac macosx} {
+declare 62 {mac aqua} {
     void XSetBackground(Display* display, GC gc, \
 	    unsigned long foreground)
 }
 
-declare 63 {mac macosx} {
+declare 63 {mac aqua} {
     void XSetForeground(Display* display, GC gc, \
 	    unsigned long foreground)
 }
 
-declare 64 {mac macosx} {
+declare 64 {mac aqua} {
     void XSetClipMask(Display* display, GC gc, Pixmap pixmap)
 }
 
-declare 65 {mac macosx} {
+declare 65 {mac aqua} {
     void XSetClipOrigin(Display* display, GC gc, \
 	    int clip_x_origin, int clip_y_origin)
 }
 
-declare 66 {mac macosx} {
+declare 66 {mac aqua} {
     void XSetTSOrigin(Display* display, GC gc, \
 	    int ts_x_origin, int ts_y_origin)
 }
 
-declare 67 {mac macosx} {
+declare 67 {mac aqua} {
     void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values)
 }
 
-declare 68 {mac macosx} {
+declare 68 {mac aqua} {
     void XSetFont(Display *display, GC gc, Font font)
 }
 
-declare 69 {mac macosx} {
+declare 69 {mac aqua} {
     void XSetArcMode(Display *display, GC gc, int arc_mode)
 }
 
-declare 70 {mac macosx} {
+declare 70 {mac aqua} {
     void XSetStipple(Display *display, GC gc, Pixmap stipple)
 }
 
-declare 71 {mac macosx} {
+declare 71 {mac aqua} {
     void XSetFillRule(Display *display, GC gc, int fill_rule)
 }
 
-declare 72 {mac macosx} {
+declare 72 {mac aqua} {
     void XSetFillStyle(Display *display, GC gc, int fill_style)
 }
 
-declare 73 {mac macosx} {
+declare 73 {mac aqua} {
     void XSetFunction(Display *display, GC gc, int function)
 }
 
-declare 74 {mac macosx} {
+declare 74 {mac aqua} {
     void XSetLineAttributes(Display *display, GC gc, \
 	    unsigned int line_width, int line_style, \
 	    int cap_style, int join_style)
 }
 
-declare 75 {mac macosx} {
+declare 75 {mac aqua} {
     int _XInitImageFuncPtrs(XImage *image)
 }
 
-declare 76 {mac macosx} {
+declare 76 {mac aqua} {
     XIC XCreateIC(void)
 }
 
-declare 77 {mac macosx} {
+declare 77 {mac aqua} {
     XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \
 	    XVisualInfo* vinfo_template, int* nitems_return)
 }
 
-declare 78 {mac macosx} {
+declare 78 {mac aqua} {
     void XSetWMClientMachine(Display* display, Window w, \
 	    XTextProperty* text_prop)
 }
 
-declare 79 {mac macosx} {
+declare 79 {mac aqua} {
     Status XStringListToTextProperty(char** list, int count, \
 	    XTextProperty* text_prop_return)
 }
-declare 80 {mac macosx} {
+declare 80 {mac aqua} {
     void XDrawSegments(Display *display, Drawable  d, GC gc, \
 	    XSegment *segments, int  nsegments)
 }
-declare 81 {mac macosx} {
+declare 81 {mac aqua} {
     void  XForceScreenSaver(Display* display, int mode)
 }
-declare 82 {mac macosx} {
+declare 82 {mac aqua} {
     void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \
 	    int x2, int y2)
 }
-declare 83 {mac macosx} {
+declare 83 {mac aqua} {
     void XFillRectangle (Display* display, Drawable d, GC gc, \
 	    int x, int y, unsigned int width, unsigned int height)
 }
-declare 84 {mac macosx} {
+declare 84 {mac aqua} {
     void XClearWindow (Display* d, Window w)
 }
 
-declare 85 {mac macosx} {
+declare 85 {mac aqua} {
     void XDrawPoint (Display* display, Drawable d, GC gc, int x, int y)
 }
 
-declare 86 {mac macosx} {
+declare 86 {mac aqua} {
     void XDrawPoints (Display* display, Drawable d, GC gc, XPoint *points, \
 	    int npoints, int mode)
 }
 
-declare 87 {mac macosx} {
+declare 87 {mac aqua} {
     void XWarpPointer (Display* display, Window src_w, Window dest_w, \
 	    int src_x, int src_y, unsigned int src_width, \
 	    unsigned int src_height, int dest_x, int dest_y)
 }
 
-declare 88 {mac macosx} {
+declare 88 {mac aqua} {
     void XQueryColor (Display *display, Colormap colormap, XColor *def_in_out)
 }
 
-declare 89 {mac macosx} {
+declare 89 {mac aqua} {
     void XQueryColors (Display *display, Colormap colormap, \
 	    XColor *defs_in_out, int ncolors)
 }
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 8e6d59e..7c4642c 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -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: tkIntDecls.h,v 1.13.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.13.2.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -377,11 +377,11 @@ EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn,
 EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn, 
 				XRectangle* rect_return));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 113 */
 EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn, 
 				XRectangle* rect_return));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 /* 114 */
 EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
@@ -390,10 +390,10 @@ EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
 /* 114 */
 EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 114 */
 EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 /* 115 */
 EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
@@ -402,10 +402,10 @@ EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
 /* 115 */
 EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 115 */
 EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 /* 116 */
 EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra, 
@@ -416,11 +416,11 @@ EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra,
 EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra, 
 				TkRegion srcb, TkRegion dr_return));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 116 */
 EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra, 
 				TkRegion srcb, TkRegion dr_return));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 /* 117 */
 EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, 
@@ -433,12 +433,12 @@ EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x,
 				int y, unsigned int width, 
 				unsigned int height));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 117 */
 EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, 
 				int y, unsigned int width, 
 				unsigned int height));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 /* 118 */
 EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
@@ -449,11 +449,11 @@ EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc,
 EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
 				TkRegion rgn));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 118 */
 EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
 				TkRegion rgn));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 /* 119 */
 EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
@@ -464,11 +464,11 @@ EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect,
 EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
 				TkRegion src, TkRegion dr_return));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 119 */
 EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
 				TkRegion src, TkRegion dr_return));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef MAC_TCL
 /* 120 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
@@ -725,7 +725,7 @@ typedef struct TkIntStubs {
     void (*tkpGetSubFonts) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Font tkfont)); /* 110 */
     Tcl_Obj * (*tkpGetSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, char * dbName, char * className)); /* 111 */
     void (*tkpMenuThreadInit) _ANSI_ARGS_((void)); /* 112 */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved113;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -735,9 +735,12 @@ typedef struct TkIntStubs {
     void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
+    void *reserved113;
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved114;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -747,9 +750,12 @@ typedef struct TkIntStubs {
     TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
+    void *reserved114;
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved115;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -759,9 +765,12 @@ typedef struct TkIntStubs {
     void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
+    void *reserved115;
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved116;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -771,9 +780,12 @@ typedef struct TkIntStubs {
     void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */
+    void *reserved116;
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved117;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -783,9 +795,12 @@ typedef struct TkIntStubs {
     int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */
+    void *reserved117;
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved118;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -795,9 +810,12 @@ typedef struct TkIntStubs {
     void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
+    void *reserved118;
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved119;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -807,9 +825,12 @@ typedef struct TkIntStubs {
     void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TCL
-    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
+    void *reserved119;
 #endif /* MAC_OSX_TCL */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#ifdef MAC_OSX_TK
+    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
+#endif /* MAC_OSX_TK */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved120;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -821,7 +842,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 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 */
     void *reserved121;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -833,7 +854,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 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 */
     void *reserved122;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -845,7 +866,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 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 */
     void *reserved123;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -857,7 +878,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 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 */
     void *reserved124;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -869,7 +890,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 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 */
     void *reserved125;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -881,7 +902,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 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 */
     void *reserved126;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -893,7 +914,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 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 */
     void *reserved127;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -905,7 +926,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 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 */
     void *reserved128;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -918,7 +939,7 @@ typedef struct TkIntStubs {
     void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 128 */
 #endif /* MAC_OSX_TCL */
     void *reserved129;
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved130;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -930,7 +951,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 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 */
     void *reserved131;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -943,7 +964,7 @@ typedef struct TkIntStubs {
     int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 131 */
 #endif /* MAC_OSX_TCL */
     void *reserved132;
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void *reserved133;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -955,7 +976,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_OSX_TCL
     void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 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 */
     void *reserved134;
 #endif /* UNIX */
 #ifdef __WIN32__
@@ -1450,12 +1471,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkClipBox) /* 113 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkClipBox
 #define TkClipBox \
 	(tkIntStubsPtr->tkClipBox) /* 113 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 #ifndef TkCreateRegion
 #define TkCreateRegion \
@@ -1468,12 +1489,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkCreateRegion) /* 114 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkCreateRegion
 #define TkCreateRegion \
 	(tkIntStubsPtr->tkCreateRegion) /* 114 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 #ifndef TkDestroyRegion
 #define TkDestroyRegion \
@@ -1486,12 +1507,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkDestroyRegion
 #define TkDestroyRegion \
 	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 #ifndef TkIntersectRegion
 #define TkIntersectRegion \
@@ -1504,12 +1525,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkIntersectRegion
 #define TkIntersectRegion \
 	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 #ifndef TkRectInRegion
 #define TkRectInRegion \
@@ -1522,12 +1543,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkRectInRegion) /* 117 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkRectInRegion
 #define TkRectInRegion \
 	(tkIntStubsPtr->tkRectInRegion) /* 117 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 #ifndef TkSetRegion
 #define TkSetRegion \
@@ -1540,12 +1561,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkSetRegion) /* 118 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkSetRegion
 #define TkSetRegion \
 	(tkIntStubsPtr->tkSetRegion) /* 118 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef __WIN32__
 #ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion \
@@ -1558,12 +1579,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion \
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 #ifdef MAC_TCL
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index e19959f..204b1f3 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.9.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.9.2.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -32,7 +32,7 @@
  * Exported function declarations:
  */
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
 /* 0 */
 EXTERN void		TkCreateXEventSource _ANSI_ARGS_((void));
 /* 1 */
@@ -296,7 +296,7 @@ EXTERN MacDrawable *	TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr));
 /* 65 */
 EXTERN void		TkMacPreprocessMenu _ANSI_ARGS_((void));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 0 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
 				TkWindow * winPtr, int active));
@@ -421,13 +421,13 @@ EXTERN void		TkMacOSXPreprocessMenu _ANSI_ARGS_((void));
 EXTERN int		TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
 /* 47 */
 EXTERN Tk_Window	TkMacOSXGetCapture _ANSI_ARGS_((void));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 
 typedef struct TkIntPlatStubs {
     int magic;
     struct TkIntPlatStubHooks *hooks;
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
     void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */
     void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay * dispPtr, Window w)); /* 1 */
     void (*tkInitXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 2 */
@@ -542,7 +542,7 @@ typedef struct TkIntPlatStubs {
     MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 64 */
     void (*tkMacPreprocessMenu) _ANSI_ARGS_((void)); /* 65 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
     Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 1 */
     void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 2 */
@@ -591,7 +591,7 @@ typedef struct TkIntPlatStubs {
     void (*tkMacOSXPreprocessMenu) _ANSI_ARGS_((void)); /* 45 */
     int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 46 */
     Tk_Window (*tkMacOSXGetCapture) _ANSI_ARGS_((void)); /* 47 */
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 } TkIntPlatStubs;
 
 #ifdef __cplusplus
@@ -608,7 +608,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
  * Inline function declarations:
  */
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TCL))/* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))/* UNIX */
 #ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
@@ -1017,7 +1017,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkMacPreprocessMenu) /* 65 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
@@ -1210,7 +1210,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkMacOSXGetCapture \
 	(tkIntPlatStubsPtr->tkMacOSXGetCapture) /* 47 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index e2ec06e..804014e 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.13.8.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.13.8.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -652,7 +652,7 @@ EXTERN void		XQueryColors _ANSI_ARGS_((Display * display,
 				Colormap colormap, XColor * defs_in_out, 
 				int ncolors));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 0 */
 EXTERN void		XSetDashes _ANSI_ARGS_((Display* display, GC gc, 
 				int dash_offset, _Xconst char* dash_list, 
@@ -937,7 +937,7 @@ EXTERN void		XQueryColor _ANSI_ARGS_((Display * display,
 EXTERN void		XQueryColors _ANSI_ARGS_((Display * display, 
 				Colormap colormap, XColor * defs_in_out, 
 				int ncolors));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 
 typedef struct TkIntXlibStubs {
     int magic;
@@ -1144,7 +1144,7 @@ typedef struct TkIntXlibStubs {
     void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */
     void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
     void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */
     XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */
     XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */
@@ -1235,7 +1235,7 @@ typedef struct TkIntXlibStubs {
     void (*xWarpPointer) _ANSI_ARGS_((Display* display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */
     void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */
     void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 } TkIntXlibStubs;
 
 #ifdef __cplusplus
@@ -2041,7 +2041,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef XSetDashes
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
@@ -2402,7 +2402,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XQueryColors \
 	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 929ed21..583b020 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlatDecls.h,v 1.6.6.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.6.6.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -82,7 +82,7 @@ EXTERN int		TkMacHaveAppearance _ANSI_ARGS_((void));
 /* 10 */
 EXTERN GWorldPtr	TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 /* 0 */
 EXTERN void		Tk_MacOSXSetEmbedHandler _ANSI_ARGS_((
 				Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, 
@@ -120,7 +120,7 @@ EXTERN int		Tk_MacOSXOpenBundleResources _ANSI_ARGS_((
 EXTERN void		Tk_MacOSXSetupTkNotifier _ANSI_ARGS_((void));
 /* 11 */
 EXTERN int		Tk_MacOSXIsAppInFront _ANSI_ARGS_((void));
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 
 typedef struct TkPlatStubs {
     int magic;
@@ -147,7 +147,7 @@ typedef struct TkPlatStubs {
     int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 9 */
     GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 10 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
     void (*tk_MacOSXSetEmbedHandler) _ANSI_ARGS_((Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacOSXEmbedGetClipProc * getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc)); /* 0 */
     void (*tk_MacOSXTurnOffMenus) _ANSI_ARGS_((void)); /* 1 */
     void (*tk_MacOSXTkOwnsCursor) _ANSI_ARGS_((int tkOwnsIt)); /* 2 */
@@ -160,7 +160,7 @@ typedef struct TkPlatStubs {
     int (*tk_MacOSXOpenBundleResources) _ANSI_ARGS_((Tcl_Interp * interp, char * bundleName, char * libraryPath, int maxPathLen, int hasResourceFile)); /* 9 */
     void (*tk_MacOSXSetupTkNotifier) _ANSI_ARGS_((void)); /* 10 */
     int (*tk_MacOSXIsAppInFront) _ANSI_ARGS_((void)); /* 11 */
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 } TkPlatStubs;
 
 #ifdef __cplusplus
@@ -249,7 +249,7 @@ extern TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tkMacGetDrawablePort) /* 10 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #ifndef Tk_MacOSXSetEmbedHandler
 #define Tk_MacOSXSetEmbedHandler \
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
@@ -298,7 +298,7 @@ extern TkPlatStubs *tkPlatStubsPtr;
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 11 */
 #endif
-#endif /* MAC_OSX_TCL */
+#endif /* MAC_OSX_TK */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkPort.h b/generic/tkPort.h
index 8ce9ee2..32a652b 100644
--- a/generic/tkPort.h
+++ b/generic/tkPort.h
@@ -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: tkPort.h,v 1.2.24.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkPort.h,v 1.2.24.2 2001/10/17 07:02:07 wolfsuit Exp $
  */
 
 #ifndef _TKPORT
@@ -28,7 +28,7 @@
 #else
 #   if defined(MAC_TCL)
 #	include "tkMacPort.h"
-#   elif defined(MAC_OSX_TCL)
+#   elif defined(MAC_OSX_TK)
 #       include "../macosx/tkMacOSXPort.h"
 #   else
 #	include "../unix/tkUnixPort.h"
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index adb4999..d53bce3 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.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: tkMacOSXFont.c,v 1.1.2.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.1.2.2 2001/10/17 07:02:02 wolfsuit Exp $
  */
 #include <Carbon/Carbon.h>
 
@@ -1148,7 +1148,7 @@ TkMacOSXIsCharacterMissing(
  * For some reason, FMSwapFont always returns a NULL font handle under OS X
  * Until we figure this one out, return 0;
  */
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
     return 0;
 #else
     MacFont *fontPtr = (MacFont *) tkfont;
@@ -1750,7 +1750,7 @@ FontMapLoadPage(
     fmOut=FMSwapFont(&fm);
     fHandle=fmOut->fontHandle;
     isMultiByteFont=subFontPtr->familyPtr->isMultiByteFont;
-#ifndef MAC_OSX_TCL
+#ifndef MAC_OSX_TK
     GetResInfo(fHandle, &theID, &theType, theName);
     fprintf ( stderr, "ResError() %d, %x\n", ResError (), fHandle );
     if (theType=='sfnt') {
@@ -1772,7 +1772,7 @@ FontMapLoadPage(
                                                    << (bitOffset & 7);
             }
         }
-#ifndef MAC_OSX_TCL
+#ifndef MAC_OSX_TK
     } else {
         /*
          * Found an old bitmap font which has a well-defined record.
diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c
index 86b9544..c3e4a74 100644
--- a/unix/tkUnix3d.c
+++ b/unix/tkUnix3d.c
@@ -9,12 +9,12 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnix3d.c,v 1.5.8.1 2001/10/15 09:22:00 wolfsuit Exp $
+ * RCS: @(#) $Id: tkUnix3d.c,v 1.5.8.2 2001/10/17 07:02:02 wolfsuit Exp $
  */
 
 #include <tk3d.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/xlib/X11/X.h b/xlib/X11/X.h
index a86fd26..7755cac 100644
--- a/xlib/X11/X.h
+++ b/xlib/X11/X.h
@@ -33,7 +33,7 @@ SOFTWARE.
 #define X_PROTOCOL	11		/* current protocol version */
 #define X_PROTOCOL_REVISION 0		/* current minor version */
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   define Cursor XCursor
 #   define Region XRegion
 #endif
@@ -669,7 +669,7 @@ are reserved in the protocol for errors and replies. */
 #define LSBFirst		0
 #define MSBFirst		1
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   undef Cursor
 #   undef Region
 #endif
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 7edbebc..252b11d 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -27,7 +27,7 @@
 
 #define XlibSpecificationRelease 5
 
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TCL)
+#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
 #   include <X11/X.h>
 #endif
 #ifdef MAC_TCL
@@ -35,7 +35,7 @@
 #   define Cursor XCursor
 #   define Region XRegion
 #endif
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #   include <X11/X.h>
 #   define Cursor XCursor
 #   define Region XRegion
@@ -64,7 +64,7 @@ typedef unsigned long wchar_t;
 typedef char *XPointer;
 
 #define Bool int
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 /* Use define rather than typedef, since may need to undefine this later */
 #define Status int
 #else
@@ -1206,7 +1206,7 @@ _XFUNCPROTOBEGIN
 
 _XFUNCPROTOEND
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   undef Cursor
 #   undef Region
 #endif
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index 6913c12..8812c80 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 /* You must include <X11/Xlib.h> before including this file */
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   define Region XRegion
 #endif
 
@@ -848,7 +848,7 @@ extern void XXorRegion(
 
 _XFUNCPROTOEND
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TCL)
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   undef Region
 #endif
 
diff --git a/xlib/xgc.c b/xlib/xgc.c
index bdd83b6..5beeecc 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.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: xgc.c,v 1.5.8.1 2001/10/15 09:22:01 wolfsuit Exp $
+ * RCS: @(#) $Id: xgc.c,v 1.5.8.2 2001/10/17 07:01:59 wolfsuit Exp $
  */
 
 #include <tkInt.h>
@@ -23,7 +23,7 @@
 #	define Cursor XCursor
 #	define Region XRegion
 #endif
-#ifdef MAC_OSX_TCL
+#ifdef MAC_OSX_TK
 #	include <X11/Xlib.h>
 #	include <X11/X.h>
 #	define Cursor XCursor
@@ -445,7 +445,7 @@ XDrawPoints(display, d, gc, points, npoints, mode)
     }
 }
 
-#if !defined(MAC_TCL) && !defined(MAC_OSX_TCL)
+#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
 void
 XDrawSegments(display, d, gc, segments, nsegments)
     Display* display;