Removed support for Mac OS Classic platform [Patch 918139]

24 files changed, 182 insertions, 2661 deletions

diff --git a/generic/README b/generic/README
index 4cbf41e..b7c8c12 100644
--- a/generic/README
+++ b/generic/README
@@ -1,5 +1,5 @@
 This directory contains Tk source files that work on all the platforms
-where Tk runs (e.g. UNIX, PCs, and Macintoshes).  Platform-specific
-sources are in the directories ../unix, ../win, and ../mac.
+where Tk runs (e.g. UNIX, PCs, and MacOSX).  Platform-specific
+sources are in the directories ../unix, ../win, and ../macosx.
 
-RCS ID: @(#) $Id: README,v 1.2 1998/09/14 18:23:02 stanton Exp $
+RCS ID: @(#) $Id: README,v 1.3 2004/03/17 18:15:42 das Exp $
diff --git a/generic/default.h b/generic/default.h
index 2ec68a3..1859369 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.4 2002/08/31 06:12:19 das Exp $
+ * RCS: @(#) $Id: default.h,v 1.5 2004/03/17 18:15:42 das Exp $
  */
 
 #ifndef _DEFAULT
@@ -22,8 +22,6 @@
 #else
 #   if defined(MAC_OSX_TK)
 #	include "tkMacOSXDefault.h"
-#   elif defined(MAC_TCL)
-#	include "tkMacDefault.h"
 #   else
 #	include "tkUnixDefault.h"
 #   endif
diff --git a/generic/tk.decls b/generic/tk.decls
index 0f5d4ad..7465788 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.25 2003/03/06 15:05:25 dkf Exp $
+# RCS: @(#) $Id: tk.decls,v 1.26 2004/03/17 18:15:42 das Exp $
 
 library tk
 
@@ -1298,58 +1298,6 @@ declare 5 win {
 	    UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result)
 }
 
-# Mac specific functions
-
-declare 0 mac {
-    void Tk_MacSetEmbedHandler (
-	    Tk_MacEmbedRegisterWinProc *registerWinProcPtr,
-	    Tk_MacEmbedGetGrafPortProc *getPortProcPtr,
-	    Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr,
-	    Tk_MacEmbedGetClipProc *getClipProc,
-	    Tk_MacEmbedGetOffsetInParentProc *getOffsetProc)
-}
- 
-declare 1 mac {
-    void Tk_MacTurnOffMenus (void)
-}
-
-declare 2 mac {
-    void Tk_MacTkOwnsCursor (int tkOwnsIt)
-}
-
-declare 3 mac {
-    void TkMacInitMenus (Tcl_Interp *interp)
-}
-
-declare 4 mac {
-    void TkMacInitAppleEvents (Tcl_Interp *interp)
-}
-
-declare 5 mac {
-    int TkMacConvertEvent (EventRecord *eventPtr)
-}
-
-declare 6 mac {
-    int TkMacConvertTkEvent (EventRecord *eventPtr, Window window)
-}
-
-declare 7 mac {
-    void TkGenWMConfigureEvent (Tk_Window tkwin,
-	    int x, int y, int width, int height, int flags)
-}
-
-declare 8 mac {
-    void TkMacInvalClipRgns (TkWindow *winPtr)
-}
-
-declare 9 mac {
-    int TkMacHaveAppearance (void)
-}
-
-declare 10 mac {
-    GWorldPtr TkMacGetDrawablePort (Drawable drawable)
-}
-
 # Mac OS X specific functions
 
 declare 0 aqua {
diff --git a/generic/tk.h b/generic/tk.h
index 9a23e3e..c2d21c7 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.78 2004/03/02 00:49:13 hobbs Exp $
+ * RCS: @(#) $Id: tk.h,v 1.79 2004/03/17 18:15:42 das Exp $
  */
 
 #ifndef _TK
@@ -34,7 +34,6 @@ extern "C" {
  * unix/configure.in	(2 LOC Major, 2 LOC minor, 1 LOC patch)
  * win/configure.in	(as above)
  * README		(sections 0 and 1)
- * mac/README		(not patchlevel)
  * macosx/Wish.pbproj/project.pbxproj
  * 			(14 LOC total, 4 LOC patch)
  * win/README		(not patchlevel)
@@ -59,7 +58,7 @@ extern "C" {
  * compilers.  We use this method because there is no autoconf equivalent.
  */
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
 #   ifndef REDO_KEYSYM_LOOKUP
 #	define REDO_KEYSYM_LOOKUP
 #   endif
@@ -85,10 +84,7 @@ extern "C" {
 #ifndef RC_INVOKED
     
 #ifndef _XLIB_H
-#   if defined (MAC_TCL)
-#	include <Xlib.h>
-#	include <X.h>
-#   elif defined(MAC_OSX_TK)
+#   if defined(MAC_OSX_TK)
 #	include <X11/Xlib.h>
 #	include <X11/X.h>
 #   else
diff --git a/generic/tkBind.c b/generic/tkBind.c
index ee434af..438a9b4 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.31 2004/02/18 02:22:11 hobbs Exp $
+ *  RCS: @(#) $Id: tkBind.c,v 1.32 2004/03/17 18:15:42 das Exp $
  */
 
 #include "tkPort.h"
@@ -21,7 +21,7 @@
 #include "tkWinInt.h"
 #endif
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* UNIX */
 #include "tkUnixInt.h"
 #endif
 
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index e84ba83..39aaf06 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.31 2002/09/02 19:16:23 hobbs Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.32 2004/03/17 18:15:43 das Exp $
  */
 
 #include "tkPort.h"
@@ -20,8 +20,6 @@
 
 #if defined(WIN32)
 #include "tkWinInt.h"
-#elif defined(MAC_TCL)
-#include "tkMacInt.h"
 #elif defined(MAC_OSX_TK) 
 #include "tkMacOSXInt.h"
 #else
@@ -842,8 +840,6 @@ Tk_TkObjCmd(clientData, interp, objc, objv)
 	    }
 #if defined(WIN32)
 	    windowingsystem = "win32";
-#elif defined(MAC_TCL)
-	    windowingsystem = "classic";
 #elif defined(MAC_OSX_TK)
 	    windowingsystem = "aqua";
 #else
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 17161cf..0c05fe5 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.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: tkConsole.c,v 1.19 2003/09/20 03:43:29 chengyemao Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.20 2004/03/17 18:15:43 das Exp $
  */
 
 #include "tk.h"
@@ -332,11 +332,7 @@ Tk_CreateConsoleWindow(interp)
     Tk_Window mainWindow = Tk_MainWindow(interp);
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
-#ifdef MAC_TCL
-    static char initCmd[] = "if {[catch {source $tk_library:console.tcl}]} {source -rsrc console}";
-#else
     static char initCmd[] = "source $tk_library/console.tcl";
-#endif
     
     consoleInterp = Tcl_CreateInterp();
     if (consoleInterp == NULL) {
diff --git a/generic/tkFileFilter.h b/generic/tkFileFilter.h
index e1bc763..4893c1b 100644
--- a/generic/tkFileFilter.h
+++ b/generic/tkFileFilter.h
@@ -9,18 +9,14 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFileFilter.h,v 1.4 1998/09/14 18:23:10 stanton Exp $
+ * RCS: @(#) $Id: tkFileFilter.h,v 1.5 2004/03/17 18:15:43 das Exp $
  *
  */
 
 #ifndef _TK_FILE_FILTER
 #define _TK_FILE_FILTER
 
-#ifdef MAC_TCL
-#include <StandardFile.h>
-#else
 #define OSType long
-#endif
 
 #ifdef BUILD_tk
 # undef TCL_STORAGE_CLASS
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 4bf826f..bdf8497 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.9 2002/08/31 06:12:20 das Exp $
+ * RCS: @(#) $Id: tkGrab.c,v 1.10 2004/03/17 18:15:43 das Exp $
  */
 
 #include "tkPort.h"
 #include "tkInt.h"
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 #include "tkUnixInt.h"
 #endif
 
diff --git a/generic/tkInitScript.h b/generic/tkInitScript.h
index 2e2b234..02da882 100644
--- a/generic/tkInitScript.h
+++ b/generic/tkInitScript.h
@@ -2,14 +2,13 @@
  * tkInitScript.h --
  *
  *	This file contains Unix & Windows common init script
- *      It is not used on the Mac. (the mac init script is in tkMacInit.c)
  *
  * Copyright (c) 1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkInitScript.h,v 1.8 1999/04/16 01:51:15 stanton Exp $
+ * RCS: @(#) $Id: tkInitScript.h,v 1.9 2004/03/17 18:15:43 das Exp $
  */
 
 
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 4ae93b4..ebfae12 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.34 2003/10/13 03:41:37 hobbs Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.35 2004/03/17 18:15:43 das Exp $
 
 library tk
 
@@ -527,94 +527,49 @@ declare 112 generic {
     void TkpMenuThreadInit (void)
 }
 
-declare 113 {mac aqua win}  {
+declare 113 {aqua win}  {
     void TkClipBox (TkRegion rgn, XRectangle* rect_return)
 }
 
-declare 114 {mac aqua win}  {
+declare 114 {aqua win}  {
     TkRegion TkCreateRegion (void)
 }
 
-declare 115 {mac aqua win} {
+declare 115 {aqua win} {
     void TkDestroyRegion (TkRegion rgn)
 }
 
-declare 116 {mac aqua win} {
+declare 116 {aqua win} {
     void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return)
 }
 
-declare 117 {mac aqua win} {
+declare 117 {aqua win} {
     int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \
 	    unsigned int height)
 }
 
-declare 118 {mac aqua win} {
+declare 118 {aqua win} {
     void TkSetRegion (Display* display, GC gc, TkRegion rgn)
 }
 
-declare 119 {mac aqua win} {
+declare 119 {aqua win} {
     void TkUnionRectWithRegion (XRectangle* rect, \
 	    TkRegion src, TkRegion dr_return)
 }
 
-# removed duplicate from tkIntPlat table
-#declare 120 mac {
-#    void TkGenerateActivateEvents (TkWindow *winPtr, int active)
-#}
-
-declare 121 {mac aqua} {
+declare 121 {aqua} {
     Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) 
 }
 
-declare 122 {mac aqua} {
+declare 122 {aqua} {
     void TkpDefineNativeBitmaps (void)
 }
 
-# removed duplicate from tkIntPlat table
-#declare 123 mac {
-#    unsigned long TkpGetMS (void)
-#}
-
-declare 124 {mac aqua} {
+declare 124 {aqua} {
     Pixmap TkpGetNativeAppBitmap (Display *display, \
  	    CONST char *name, int *width, int *height)
 }
 
-# removed duplicates from tkIntPlat table
-#declare 125 mac {
-#    void TkPointerDeadWindow (TkWindow *winPtr)
-#}
-#
-#declare 126 mac {
-#    void TkpSetCapture (TkWindow *winPtr)
-#}
-#
-#declare 127 mac {
-#    void TkpSetCursor (TkpCursor cursor)
-#}
-#
-#declare 128 mac {
-#    void TkpWmSetState (TkWindow *winPtr, int state)
-#}
-#
-#declare 130 mac {
-#    Window  TkGetTransientMaster (TkWindow *winPtr)
-#}
-#
-#declare 131 mac {
-#    int  TkGenerateButtonEvent (int x, int y, \
-# 	    Window window, unsigned int state)
-#}
-#
-#declare 133 mac {
-#    void  TkGenWMDestroyEvent (Tk_Window tkwin)
-#}
-#
-#declare 134 mac {
-#    void  TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \
-# 	    int width, int height, int flags)
-#}
-
 declare 135 generic {
     void TkpDrawHighlightBorder (Tk_Window tkwin, GC fgGC, GC bgGC, \
         int highlightWidth, Drawable drawable)
@@ -657,7 +612,7 @@ declare 144 generic {
     void TkGCCleanup(TkDisplay *dispPtr)
 }
 
-declare 145 {mac win aqua} {
+declare 145 {win aqua} {
     void TkSubtractRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return)
 }
 
@@ -890,247 +845,6 @@ declare 34 win {
 }
 
 ########################
-# Mac specific functions
-
-declare 0 mac {
-    void TkGenerateActivateEvents (TkWindow *winPtr, int active)
-}
-
-# removed duplicates from tkInt table
-#declare 1 mac {
-#    Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source)
-#}
-#
-#declare 2 mac {
-#    void TkpDefineNativeBitmaps (void)
-#}
-
-declare 3 mac {
-    unsigned long TkpGetMS (void)
-}
-
-declare 5 mac {
-    void TkPointerDeadWindow (TkWindow *winPtr)
-}
-
-declare 6 mac {
-    void TkpSetCapture (TkWindow *winPtr)
-}
-
-declare 7 mac {
-    void TkpSetCursor (TkpCursor cursor)
-}
-
-declare 8 mac {
-    void TkpWmSetState (TkWindow *winPtr, int state)
-}
-
-declare 10 mac {
-    void   TkAboutDlg (void)
-}
-
-declare 13 mac {
-    Window  TkGetTransientMaster (TkWindow *winPtr)
-}
-
-declare 14 mac {
-    int  TkGenerateButtonEvent (int x, int y, \
-	    Window window, unsigned int state)
-}
-
-declare 16 mac {
-    void  TkGenWMDestroyEvent (Tk_Window tkwin)
-}
-
-# removed duplicate from tkPlat table (tk.decls)
-#declare 17 mac {
-#    void  TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \
-#	    int width, int height, int flags)
-#}
-
-declare 18 mac {
-    unsigned int TkMacButtonKeyState (void)
-}
-
-declare 19 mac {
-    void  TkMacClearMenubarActive (void)
-}
-
-# removed duplicate from tkPlat table (tk.decls)
-#declare 20 mac {
-#    int  TkMacConvertEvent (EventRecord *eventPtr)
-#}
-
-declare 21 mac {
-    int  TkMacDispatchMenuEvent (int menuID, int index)
-}
-
-declare 22 mac {
-    void  TkMacInstallCursor (int resizeOverride)
-}
-
-# removed duplicate from tkPlat table (tk.decls)
-#declare 23 mac {
-#    int  TkMacConvertTkEvent (EventRecord *eventPtr, Window window)
-#}
-
-declare 24 mac {
-    void  TkMacHandleTearoffMenu (void)
-}
-
-# removed duplicate from tkPlat table (tk.decls)
-#declare 26 mac {
-#    void  TkMacInvalClipRgns (TkWindow *winPtr)
-#}
-
-declare 27 mac {
-    void  TkMacDoHLEvent (EventRecord *theEvent)
-}
-
-declare 29 mac {
-    Time  TkMacGenerateTime (void)
-}
-
-# removed duplicate from tkPlat table (tk.decls)
-#declare 30 mac {
-#    GWorldPtr  TkMacGetDrawablePort (Drawable drawable)
-#}
-
-declare 31 mac {
-    TkWindow *  TkMacGetScrollbarGrowWindow (TkWindow *winPtr)
-}
-
-declare 32 mac {
-    Window   TkMacGetXWindow (WindowRef macWinPtr)
-}
-
-declare 33 mac {
-    int  TkMacGrowToplevel (WindowRef whichWindow, Point start)
-}
-
-declare 34 mac {
-    void   TkMacHandleMenuSelect (long mResult, int optionKeyPressed)
-}
-
-# removed duplicates from tkPlat table (tk.decls)
-#declare 35 mac {
-#    int  TkMacHaveAppearance (void)
-#}
-#
-#declare 36 mac {
-#    void  TkMacInitAppleEvents (Tcl_Interp *interp)
-#}
-#
-#declare 37 mac {
-#    void   TkMacInitMenus (Tcl_Interp  *interp)
-#}
-
-declare 38 mac {
-    void  TkMacInvalidateWindow (MacDrawable *macWin, int flag)
-}
-
-declare 39 mac {
-    int  TkMacIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar)
-}
-
-declare 40 mac {
-    void  TkMacMakeRealWindowExist (TkWindow *winPtr)
-}
-
-declare 41 mac {
-    BitMapPtr TkMacMakeStippleMap(Drawable d1, Drawable d2)
-}
-
-declare 42 mac {
-    void  TkMacMenuClick (void)
-}
-
-declare 43 mac {
-    void  TkMacRegisterOffScreenWindow (Window window, GWorldPtr portPtr)
-}
-
-declare 44 mac {
-    int  TkMacResizable (TkWindow *winPtr)
-}
-
-declare 46 mac {
-    void  TkMacSetHelpMenuItemCount (void)
-}
-
-declare 47 mac {
-    void  TkMacSetScrollbarGrow (TkWindow *winPtr, int flag)
-}
-
-declare 48 mac {
-    void  TkMacSetUpClippingRgn (Drawable drawable)
-}
-
-declare 49 mac {
-    void  TkMacSetUpGraphicsPort (GC gc)
-}
-
-declare 50 mac {
-    void   TkMacUpdateClipRgn (TkWindow *winPtr)
-}
-
-declare 51 mac {
-    void  TkMacUnregisterMacWindow (GWorldPtr portPtr)
-}
-
-declare 52 mac {
-    int  TkMacUseMenuID (short macID)
-}
-
-declare 53 mac {
-    RgnHandle  TkMacVisableClipRgn (TkWindow *winPtr)
-}
-
-declare 54 mac {
-    void  TkMacWinBounds (TkWindow *winPtr, Rect *geometry)
-}
-
-declare 55 mac {
-    void  TkMacWindowOffset (WindowRef wRef, int *xOffset, int *yOffset)
-}
-
-declare 57 mac {
-    int   TkSetMacColor (unsigned long pixel, RGBColor *macColor)
-}
-
-declare 58 mac {
-    void   TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid)
-}
-
-declare 59 mac {
-    void  TkSuspendClipboard (void)
-}
-
-declare 61 mac {
-    int  TkMacZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart)
-}
-
-declare 62 mac {
-    Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \
-	    int rootX, int rootY, int *newX, int *newY)
-}
-
-declare 63 mac {
-    MacDrawable * TkMacContainerId (TkWindow *winPtr)
-}
-
-declare 64 mac {
-    MacDrawable * TkMacGetHostToplevel  (TkWindow *winPtr)
-}
-
-declare 65 mac {
-    void TkMacPreprocessMenu (void)
-}
-
-declare 66 mac {
-    int TkpIsWindowFloating (WindowRef window)
-}
-
-########################
 # Mac OS X specific functions
 
 declare 0 aqua {
@@ -1842,414 +1556,414 @@ declare 105 win {
 	    unsigned int sw, unsigned int sh, int dx, int dy)
 }
 
-# X functions for Mac and Aqua
+# X functions for Aqua
 
-declare 0 {mac aqua} {
+declare 0 {aqua} {
     void XSetDashes (Display* display, GC gc, int dash_offset,
 	    _Xconst char* dash_list, int n)
 }
 
-declare 1 {mac aqua} {
+declare 1 {aqua} {
     XModifierKeymap* XGetModifierMapping (Display* d)
 }
 
-declare 2 {mac aqua} {
+declare 2 {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 aqua} {
+declare 3 {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 aqua} {
+declare 4 {aqua} {
     char *XGetAtomName (Display* d,Atom a)
 
 }
 
-declare 5 {mac aqua} {
+declare 5 {aqua} {
     char *XKeysymToString (KeySym k)
 }
 
-declare 6 {mac aqua} {
+declare 6 {aqua} {
     Colormap XCreateColormap (Display* d, Window w, Visual* v, int i)
 
 }
 
-declare 7 {mac aqua} {
+declare 7 {aqua} {
     GContext XGContextFromGC (GC g)
 }
 
-declare 8 {mac aqua} {
+declare 8 {aqua} {
     KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i)
 }
 
-declare 9 {mac aqua} {
+declare 9 {aqua} {
     KeySym XStringToKeysym (_Xconst char* c)
 }
 
-declare 10 {mac aqua} {
+declare 10 {aqua} {
     Window XRootWindow (Display* d, int i)
 }
 
-declare 11 {mac aqua} {
+declare 11 {aqua} {
     XErrorHandler XSetErrorHandler  (XErrorHandler x)
 }
 
-declare 12 {mac aqua} {
+declare 12 {aqua} {
     Status XAllocColor (Display* d, Colormap c, XColor* xp)
 }
 
-declare 13 {mac aqua} {
+declare 13 {aqua} {
     void XBell (Display* d, int i)
 }
 
-declare 14 {mac aqua} {
+declare 14 {aqua} {
     void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \
 	    int i2, _Xconst unsigned char* c, int i3)
 }
 
-declare 15 {mac aqua} {
+declare 15 {aqua} {
     void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \
 	    XSetWindowAttributes* x)
 }
 
-declare 16 {mac aqua} {
+declare 16 {aqua} {
     void XConfigureWindow (Display* d, Window w, unsigned int i, \
 	    XWindowChanges* x)
 }
 
-declare 17 {mac aqua} {
+declare 17 {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 aqua} {
+declare 18 {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 aqua} {
+declare 19 {aqua} {
     Pixmap XCreateBitmapFromData(Display* display, Drawable d, \
 	    _Xconst char* data, unsigned int width,unsigned int height)
 }
 
-declare 20 {mac aqua} {
+declare 20 {aqua} {
     void XDefineCursor (Display* d, Window w, Cursor c)
 }
 
-declare 21 {mac aqua} {
+declare 21 {aqua} {
     void XDestroyWindow (Display* d, Window w)
 }
 
-declare 22 {mac aqua} {
+declare 22 {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 aqua} {
+declare 23 {aqua} {
     void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)
 }
 
-declare 24 {mac aqua} {
+declare 24 {aqua} {
     void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 25 {mac aqua} {
+declare 25 {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 aqua} {
+declare 26 {aqua} {
     void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \
 	    int i1, int i2, int i3)
 }
 
-declare 27 {mac aqua} {
+declare 27 {aqua} {
     void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i)
 }
 
-declare 28 {mac aqua} {
+declare 28 {aqua} {
     void XFreeColormap (Display* d, Colormap c)
 }
 
-declare 29 {mac aqua} {
+declare 29 {aqua} {
     void XFreeColors (Display* d, Colormap c, \
 	    unsigned long* ulp, int i, unsigned long ul)
 }
 
-declare 30 {mac aqua} {
+declare 30 {aqua} {
     void XFreeModifiermap (XModifierKeymap* x)
 }
 
-declare 31 {mac aqua} {
+declare 31 {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 aqua} {
+declare 32 {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 aqua} {
+declare 33 {aqua} {
     int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t)
 }
 
-declare 34 {mac aqua} {
+declare 34 {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 aqua} {
+declare 35 {aqua} {
     KeyCode XKeysymToKeycode (Display* d, KeySym k)
 }
 
-declare 36 {mac aqua} {
+declare 36 {aqua} {
     void XMapWindow (Display* d, Window w)
 }
 
-declare 37 {mac aqua} {
+declare 37 {aqua} {
     void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 38 {mac aqua} {
+declare 38 {aqua} {
     void XMoveWindow (Display* d, Window w, int i1, int i2)
 }
 
-declare 39 {mac aqua} {
+declare 39 {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 aqua} {
+declare 40 {aqua} {
     void XRaiseWindow (Display* d, Window w)
 }
 
-declare 41 {mac aqua} {
+declare 41 {aqua} {
     void XRefreshKeyboardMapping (XMappingEvent* x)
 }
 
-declare 42 {mac aqua} {
+declare 42 {aqua} {
     void XResizeWindow (Display* d, Window w, unsigned int ui1, \
 	    unsigned int ui2)
 }
 
-declare 43 {mac aqua} {
+declare 43 {aqua} {
     void XSelectInput (Display* d, Window w, long l)
 }
 
-declare 44 {mac aqua} {
+declare 44 {aqua} {
     Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x)
 }
 
-declare 45 {mac aqua} {
+declare 45 {aqua} {
     void XSetIconName (Display* d, Window w, _Xconst char* c)
 }
 
-declare 46 {mac aqua} {
+declare 46 {aqua} {
     void XSetInputFocus (Display* d, Window w, int i, Time t)
 }
 
-declare 47 {mac aqua} {
+declare 47 {aqua} {
     void XSetSelectionOwner (Display* d, Atom a, Window w, Time t)
 }
 
-declare 48 {mac aqua} {
+declare 48 {aqua} {
     void XSetWindowBackground (Display* d, Window w, unsigned long ul)
 }
 
-declare 49 {mac aqua} {
+declare 49 {aqua} {
     void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 50 {mac aqua} {
+declare 50 {aqua} {
     void XSetWindowBorder (Display* d, Window w, unsigned long ul)
 }
 
-declare 51 {mac aqua} {
+declare 51 {aqua} {
     void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 52 {mac aqua} {
+declare 52 {aqua} {
     void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui)
 }
 
-declare 53 {mac aqua} {
+declare 53 {aqua} {
     void XSetWindowColormap (Display* d, Window w, Colormap c)
 }
 
-declare 54 {mac aqua} {
+declare 54 {aqua} {
     void XUngrabKeyboard (Display* d, Time t)
 }
 
-declare 55 {mac aqua} {
+declare 55 {aqua} {
     void XUngrabPointer (Display* d, Time t) 
 }
 
-declare 56 {mac aqua} {
+declare 56 {aqua} {
     void XUnmapWindow (Display* d, Window w)
 }
 
-declare 57 {mac aqua} {
+declare 57 {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 aqua} {
+declare 58 {aqua} {
     Status XParseColor (Display *display, Colormap map, \
           _Xconst char* spec, XColor *colorPtr)
 }
 
-declare 59 {mac aqua} {
+declare 59 {aqua} {
     GC XCreateGC(Display* display, Drawable d, \
 	    unsigned long valuemask, XGCValues* values)
 }
 
-declare 60 {mac aqua} {
+declare 60 {aqua} {
     void XFreeGC(Display* display, GC gc)
 }
 
-declare 61 {mac aqua} {
+declare 61 {aqua} {
     Atom XInternAtom(Display* display,_Xconst char* atom_name, \
 	    Bool only_if_exists)
 }
 
-declare 62 {mac aqua} {
+declare 62 {aqua} {
     void XSetBackground(Display* display, GC gc, \
 	    unsigned long foreground)
 }
 
-declare 63 {mac aqua} {
+declare 63 {aqua} {
     void XSetForeground(Display* display, GC gc, \
 	    unsigned long foreground)
 }
 
-declare 64 {mac aqua} {
+declare 64 {aqua} {
     void XSetClipMask(Display* display, GC gc, Pixmap pixmap)
 }
 
-declare 65 {mac aqua} {
+declare 65 {aqua} {
     void XSetClipOrigin(Display* display, GC gc, \
 	    int clip_x_origin, int clip_y_origin)
 }
 
-declare 66 {mac aqua} {
+declare 66 {aqua} {
     void XSetTSOrigin(Display* display, GC gc, \
 	    int ts_x_origin, int ts_y_origin)
 }
 
-declare 67 {mac aqua} {
+declare 67 {aqua} {
     void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values)
 }
 
-declare 68 {mac aqua} {
+declare 68 {aqua} {
     void XSetFont(Display *display, GC gc, Font font)
 }
 
-declare 69 {mac aqua} {
+declare 69 {aqua} {
     void XSetArcMode(Display *display, GC gc, int arc_mode)
 }
 
-declare 70 {mac aqua} {
+declare 70 {aqua} {
     void XSetStipple(Display *display, GC gc, Pixmap stipple)
 }
 
-declare 71 {mac aqua} {
+declare 71 {aqua} {
     void XSetFillRule(Display *display, GC gc, int fill_rule)
 }
 
-declare 72 {mac aqua} {
+declare 72 {aqua} {
     void XSetFillStyle(Display *display, GC gc, int fill_style)
 }
 
-declare 73 {mac aqua} {
+declare 73 {aqua} {
     void XSetFunction(Display *display, GC gc, int function)
 }
 
-declare 74 {mac aqua} {
+declare 74 {aqua} {
     void XSetLineAttributes(Display *display, GC gc, \
 	    unsigned int line_width, int line_style, \
 	    int cap_style, int join_style)
 }
 
-declare 75 {mac aqua} {
+declare 75 {aqua} {
     int _XInitImageFuncPtrs(XImage *image)
 }
 
-declare 76 {mac aqua} {
+declare 76 {aqua} {
     XIC XCreateIC(void)
 }
 
-declare 77 {mac aqua} {
+declare 77 {aqua} {
     XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \
 	    XVisualInfo* vinfo_template, int* nitems_return)
 }
 
-declare 78 {mac aqua} {
+declare 78 {aqua} {
     void XSetWMClientMachine(Display* display, Window w, \
 	    XTextProperty* text_prop)
 }
 
-declare 79 {mac aqua} {
+declare 79 {aqua} {
     Status XStringListToTextProperty(char** list, int count, \
 	    XTextProperty* text_prop_return)
 }
-declare 80 {mac aqua} {
+declare 80 {aqua} {
     void XDrawSegments(Display *display, Drawable  d, GC gc, \
 	    XSegment *segments, int  nsegments)
 }
-declare 81 {mac aqua} {
+declare 81 {aqua} {
     void  XForceScreenSaver(Display* display, int mode)
 }
-declare 82 {mac aqua} {
+declare 82 {aqua} {
     void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \
 	    int x2, int y2)
 }
-declare 83 {mac aqua} {
+declare 83 {aqua} {
     void XFillRectangle (Display* display, Drawable d, GC gc, \
 	    int x, int y, unsigned int width, unsigned int height)
 }
-declare 84 {mac aqua} {
+declare 84 {aqua} {
     void XClearWindow (Display* d, Window w)
 }
 
-declare 85 {mac aqua} {
+declare 85 {aqua} {
     void XDrawPoint (Display* display, Drawable d, GC gc, int x, int y)
 }
 
-declare 86 {mac aqua} {
+declare 86 {aqua} {
     void XDrawPoints (Display* display, Drawable d, GC gc, XPoint *points, \
 	    int npoints, int mode)
 }
 
-declare 87 {mac aqua} {
+declare 87 {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 aqua} {
+declare 88 {aqua} {
     void XQueryColor (Display *display, Colormap colormap, XColor *def_in_out)
 }
 
-declare 89 {mac aqua} {
+declare 89 {aqua} {
     void XQueryColors (Display *display, Colormap colormap, \
 	    XColor *defs_in_out, int ncolors)
 }
 
-declare 90 {mac aqua} {
+declare 90 {aqua} {
     Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \
 	    Window** w4, unsigned int* ui)
 }
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 63134d9..26fb8fb 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.23 2003/10/13 03:41:37 hobbs Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.24 2004/03/17 18:15:43 das Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -712,14 +712,6 @@ EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn,
 				XRectangle* rect_return));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkClipBox_TCL_DECLARED
-#define TkClipBox_TCL_DECLARED
-/* 113 */
-EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn, 
-				XRectangle* rect_return));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkClipBox_TCL_DECLARED
 #define TkClipBox_TCL_DECLARED
@@ -735,13 +727,6 @@ EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn,
 EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkCreateRegion_TCL_DECLARED
-#define TkCreateRegion_TCL_DECLARED
-/* 114 */
-EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkCreateRegion_TCL_DECLARED
 #define TkCreateRegion_TCL_DECLARED
@@ -756,13 +741,6 @@ EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
 EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkDestroyRegion_TCL_DECLARED
-#define TkDestroyRegion_TCL_DECLARED
-/* 115 */
-EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkDestroyRegion_TCL_DECLARED
 #define TkDestroyRegion_TCL_DECLARED
@@ -778,14 +756,6 @@ EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra,
 				TkRegion srcb, TkRegion dr_return));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkIntersectRegion_TCL_DECLARED
-#define TkIntersectRegion_TCL_DECLARED
-/* 116 */
-EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra, 
-				TkRegion srcb, TkRegion dr_return));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkIntersectRegion_TCL_DECLARED
 #define TkIntersectRegion_TCL_DECLARED
@@ -803,15 +773,6 @@ EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x,
 				unsigned int height));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkRectInRegion_TCL_DECLARED
-#define TkRectInRegion_TCL_DECLARED
-/* 117 */
-EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, 
-				int y, unsigned int width, 
-				unsigned int height));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkRectInRegion_TCL_DECLARED
 #define TkRectInRegion_TCL_DECLARED
@@ -829,14 +790,6 @@ EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc,
 				TkRegion rgn));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkSetRegion_TCL_DECLARED
-#define TkSetRegion_TCL_DECLARED
-/* 118 */
-EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
-				TkRegion rgn));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkSetRegion_TCL_DECLARED
 #define TkSetRegion_TCL_DECLARED
@@ -853,14 +806,6 @@ EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect,
 				TkRegion src, TkRegion dr_return));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkUnionRectWithRegion_TCL_DECLARED
-#define TkUnionRectWithRegion_TCL_DECLARED
-/* 119 */
-EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
-				TkRegion src, TkRegion dr_return));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkUnionRectWithRegion_TCL_DECLARED
 #define TkUnionRectWithRegion_TCL_DECLARED
@@ -870,14 +815,6 @@ EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect,
 #endif
 #endif /* MAC_OSX_TK */
 /* Slot 120 is reserved */
-#ifdef MAC_TCL
-#ifndef TkpCreateNativeBitmap_TCL_DECLARED
-#define TkpCreateNativeBitmap_TCL_DECLARED
-/* 121 */
-EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, 
-				CONST char * source));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkpCreateNativeBitmap_TCL_DECLARED
 #define TkpCreateNativeBitmap_TCL_DECLARED
@@ -886,13 +823,6 @@ EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display * display,
 				CONST char * source));
 #endif
 #endif /* MAC_OSX_TK */
-#ifdef MAC_TCL
-#ifndef TkpDefineNativeBitmaps_TCL_DECLARED
-#define TkpDefineNativeBitmaps_TCL_DECLARED
-/* 122 */
-EXTERN void		TkpDefineNativeBitmaps _ANSI_ARGS_((void));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkpDefineNativeBitmaps_TCL_DECLARED
 #define TkpDefineNativeBitmaps_TCL_DECLARED
@@ -901,14 +831,6 @@ EXTERN void		TkpDefineNativeBitmaps _ANSI_ARGS_((void));
 #endif
 #endif /* MAC_OSX_TK */
 /* Slot 123 is reserved */
-#ifdef MAC_TCL
-#ifndef TkpGetNativeAppBitmap_TCL_DECLARED
-#define TkpGetNativeAppBitmap_TCL_DECLARED
-/* 124 */
-EXTERN Pixmap		TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, 
-				CONST char * name, int * width, int * height));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkpGetNativeAppBitmap_TCL_DECLARED
 #define TkpGetNativeAppBitmap_TCL_DECLARED
@@ -992,14 +914,6 @@ EXTERN void		TkSubtractRegion _ANSI_ARGS_((TkRegion sra,
 				TkRegion srcb, TkRegion dr_return));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkSubtractRegion_TCL_DECLARED
-#define TkSubtractRegion_TCL_DECLARED
-/* 145 */
-EXTERN void		TkSubtractRegion _ANSI_ARGS_((TkRegion sra, 
-				TkRegion srcb, TkRegion dr_return));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkSubtractRegion_TCL_DECLARED
 #define TkSubtractRegion_TCL_DECLARED
@@ -1148,125 +1062,95 @@ typedef struct TkIntStubs {
     void (*tkpGetSubFonts) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Font tkfont)); /* 110 */
     Tcl_Obj * (*tkpGetSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, CONST char * dbName, CONST char * className)); /* 111 */
     void (*tkpMenuThreadInit) _ANSI_ARGS_((void)); /* 112 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved113;
 #endif /* UNIX */
 #ifdef __WIN32__
     void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved114;
 #endif /* UNIX */
 #ifdef __WIN32__
     TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved115;
 #endif /* UNIX */
 #ifdef __WIN32__
     void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved116;
 #endif /* UNIX */
 #ifdef __WIN32__
     void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */
-#endif /* MAC_TCL */
 #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) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved117;
 #endif /* UNIX */
 #ifdef __WIN32__
     int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */
-#endif /* MAC_TCL */
 #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) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved118;
 #endif /* UNIX */
 #ifdef __WIN32__
     void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
-#endif /* MAC_TCL */
 #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) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved119;
 #endif /* UNIX */
 #ifdef __WIN32__
     void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* MAC_OSX_TK */
     void *reserved120;
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved121;
 #endif /* UNIX */
 #ifdef __WIN32__
     void *reserved121;
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, CONST char * source)); /* 121 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, CONST char * source)); /* 121 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved122;
 #endif /* UNIX */
 #ifdef __WIN32__
     void *reserved122;
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */
 #endif /* MAC_OSX_TK */
     void *reserved123;
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved124;
 #endif /* UNIX */
 #ifdef __WIN32__
     void *reserved124;
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */
 #endif /* MAC_OSX_TK */
@@ -1290,15 +1174,12 @@ typedef struct TkIntStubs {
     void (*tkFocusFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 142 */
     void (*tkClipCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 143 */
     void (*tkGCCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 144 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     void *reserved145;
 #endif /* UNIX */
 #ifdef __WIN32__
     void (*tkSubtractRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 145 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkSubtractRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 145 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*tkSubtractRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 145 */
 #endif /* MAC_OSX_TK */
@@ -1777,12 +1658,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkClipBox) /* 113 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkClipBox
-#define TkClipBox \
-	(tkIntStubsPtr->tkClipBox) /* 113 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkClipBox
 #define TkClipBox \
@@ -1795,12 +1670,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkCreateRegion) /* 114 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkCreateRegion
-#define TkCreateRegion \
-	(tkIntStubsPtr->tkCreateRegion) /* 114 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkCreateRegion
 #define TkCreateRegion \
@@ -1813,12 +1682,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkDestroyRegion
-#define TkDestroyRegion \
-	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkDestroyRegion
 #define TkDestroyRegion \
@@ -1831,12 +1694,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkIntersectRegion
-#define TkIntersectRegion \
-	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkIntersectRegion
 #define TkIntersectRegion \
@@ -1849,12 +1706,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkRectInRegion) /* 117 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkRectInRegion
-#define TkRectInRegion \
-	(tkIntStubsPtr->tkRectInRegion) /* 117 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkRectInRegion
 #define TkRectInRegion \
@@ -1867,12 +1718,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkSetRegion) /* 118 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkSetRegion
-#define TkSetRegion \
-	(tkIntStubsPtr->tkSetRegion) /* 118 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkSetRegion
 #define TkSetRegion \
@@ -1885,12 +1730,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkUnionRectWithRegion
-#define TkUnionRectWithRegion \
-	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion \
@@ -1898,24 +1737,12 @@ extern TkIntStubs *tkIntStubsPtr;
 #endif
 #endif /* MAC_OSX_TK */
 /* Slot 120 is reserved */
-#ifdef MAC_TCL
-#ifndef TkpCreateNativeBitmap
-#define TkpCreateNativeBitmap \
-	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkpCreateNativeBitmap
 #define TkpCreateNativeBitmap \
 	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
 #endif
 #endif /* MAC_OSX_TK */
-#ifdef MAC_TCL
-#ifndef TkpDefineNativeBitmaps
-#define TkpDefineNativeBitmaps \
-	(tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkpDefineNativeBitmaps
 #define TkpDefineNativeBitmaps \
@@ -1923,12 +1750,6 @@ extern TkIntStubs *tkIntStubsPtr;
 #endif
 #endif /* MAC_OSX_TK */
 /* Slot 123 is reserved */
-#ifdef MAC_TCL
-#ifndef TkpGetNativeAppBitmap
-#define TkpGetNativeAppBitmap \
-	(tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkpGetNativeAppBitmap
 #define TkpGetNativeAppBitmap \
@@ -1991,12 +1812,6 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkSubtractRegion) /* 145 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkSubtractRegion
-#define TkSubtractRegion \
-	(tkIntStubsPtr->tkSubtractRegion) /* 145 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkSubtractRegion
 #define TkSubtractRegion \
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 6a452a7..ebed2ae 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.16 2003/10/13 03:41:37 hobbs Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.17 2004/03/17 18:15:43 das Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -226,283 +226,6 @@ EXTERN int		TkWinGetPlatformId _ANSI_ARGS_((void));
 EXTERN void		TkWinSetHINSTANCE _ANSI_ARGS_((HINSTANCE hInstance));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkGenerateActivateEvents_TCL_DECLARED
-#define TkGenerateActivateEvents_TCL_DECLARED
-/* 0 */
-EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
-				TkWindow * winPtr, int active));
-#endif
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-#ifndef TkpGetMS_TCL_DECLARED
-#define TkpGetMS_TCL_DECLARED
-/* 3 */
-EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
-#endif
-/* Slot 4 is reserved */
-#ifndef TkPointerDeadWindow_TCL_DECLARED
-#define TkPointerDeadWindow_TCL_DECLARED
-/* 5 */
-EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkpSetCapture_TCL_DECLARED
-#define TkpSetCapture_TCL_DECLARED
-/* 6 */
-EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkpSetCursor_TCL_DECLARED
-#define TkpSetCursor_TCL_DECLARED
-/* 7 */
-EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-#endif
-#ifndef TkpWmSetState_TCL_DECLARED
-#define TkpWmSetState_TCL_DECLARED
-/* 8 */
-EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
-				int state));
-#endif
-/* Slot 9 is reserved */
-#ifndef TkAboutDlg_TCL_DECLARED
-#define TkAboutDlg_TCL_DECLARED
-/* 10 */
-EXTERN void		TkAboutDlg _ANSI_ARGS_((void));
-#endif
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-#ifndef TkGetTransientMaster_TCL_DECLARED
-#define TkGetTransientMaster_TCL_DECLARED
-/* 13 */
-EXTERN Window		TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkGenerateButtonEvent_TCL_DECLARED
-#define TkGenerateButtonEvent_TCL_DECLARED
-/* 14 */
-EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, 
-				Window window, unsigned int state));
-#endif
-/* Slot 15 is reserved */
-#ifndef TkGenWMDestroyEvent_TCL_DECLARED
-#define TkGenWMDestroyEvent_TCL_DECLARED
-/* 16 */
-EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-#endif
-/* Slot 17 is reserved */
-#ifndef TkMacButtonKeyState_TCL_DECLARED
-#define TkMacButtonKeyState_TCL_DECLARED
-/* 18 */
-EXTERN unsigned int	TkMacButtonKeyState _ANSI_ARGS_((void));
-#endif
-#ifndef TkMacClearMenubarActive_TCL_DECLARED
-#define TkMacClearMenubarActive_TCL_DECLARED
-/* 19 */
-EXTERN void		TkMacClearMenubarActive _ANSI_ARGS_((void));
-#endif
-/* Slot 20 is reserved */
-#ifndef TkMacDispatchMenuEvent_TCL_DECLARED
-#define TkMacDispatchMenuEvent_TCL_DECLARED
-/* 21 */
-EXTERN int		TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, 
-				int index));
-#endif
-#ifndef TkMacInstallCursor_TCL_DECLARED
-#define TkMacInstallCursor_TCL_DECLARED
-/* 22 */
-EXTERN void		TkMacInstallCursor _ANSI_ARGS_((int resizeOverride));
-#endif
-/* Slot 23 is reserved */
-#ifndef TkMacHandleTearoffMenu_TCL_DECLARED
-#define TkMacHandleTearoffMenu_TCL_DECLARED
-/* 24 */
-EXTERN void		TkMacHandleTearoffMenu _ANSI_ARGS_((void));
-#endif
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-#ifndef TkMacDoHLEvent_TCL_DECLARED
-#define TkMacDoHLEvent_TCL_DECLARED
-/* 27 */
-EXTERN void		TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent));
-#endif
-/* Slot 28 is reserved */
-#ifndef TkMacGenerateTime_TCL_DECLARED
-#define TkMacGenerateTime_TCL_DECLARED
-/* 29 */
-EXTERN Time		TkMacGenerateTime _ANSI_ARGS_((void));
-#endif
-/* Slot 30 is reserved */
-#ifndef TkMacGetScrollbarGrowWindow_TCL_DECLARED
-#define TkMacGetScrollbarGrowWindow_TCL_DECLARED
-/* 31 */
-EXTERN TkWindow *	TkMacGetScrollbarGrowWindow _ANSI_ARGS_((
-				TkWindow * winPtr));
-#endif
-#ifndef TkMacGetXWindow_TCL_DECLARED
-#define TkMacGetXWindow_TCL_DECLARED
-/* 32 */
-EXTERN Window		TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr));
-#endif
-#ifndef TkMacGrowToplevel_TCL_DECLARED
-#define TkMacGrowToplevel_TCL_DECLARED
-/* 33 */
-EXTERN int		TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, 
-				Point start));
-#endif
-#ifndef TkMacHandleMenuSelect_TCL_DECLARED
-#define TkMacHandleMenuSelect_TCL_DECLARED
-/* 34 */
-EXTERN void		TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, 
-				int optionKeyPressed));
-#endif
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-#ifndef TkMacInvalidateWindow_TCL_DECLARED
-#define TkMacInvalidateWindow_TCL_DECLARED
-/* 38 */
-EXTERN void		TkMacInvalidateWindow _ANSI_ARGS_((
-				MacDrawable * macWin, int flag));
-#endif
-#ifndef TkMacIsCharacterMissing_TCL_DECLARED
-#define TkMacIsCharacterMissing_TCL_DECLARED
-/* 39 */
-EXTERN int		TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont, 
-				unsigned int searchChar));
-#endif
-#ifndef TkMacMakeRealWindowExist_TCL_DECLARED
-#define TkMacMakeRealWindowExist_TCL_DECLARED
-/* 40 */
-EXTERN void		TkMacMakeRealWindowExist _ANSI_ARGS_((
-				TkWindow * winPtr));
-#endif
-#ifndef TkMacMakeStippleMap_TCL_DECLARED
-#define TkMacMakeStippleMap_TCL_DECLARED
-/* 41 */
-EXTERN BitMapPtr	TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1, 
-				Drawable d2));
-#endif
-#ifndef TkMacMenuClick_TCL_DECLARED
-#define TkMacMenuClick_TCL_DECLARED
-/* 42 */
-EXTERN void		TkMacMenuClick _ANSI_ARGS_((void));
-#endif
-#ifndef TkMacRegisterOffScreenWindow_TCL_DECLARED
-#define TkMacRegisterOffScreenWindow_TCL_DECLARED
-/* 43 */
-EXTERN void		TkMacRegisterOffScreenWindow _ANSI_ARGS_((
-				Window window, GWorldPtr portPtr));
-#endif
-#ifndef TkMacResizable_TCL_DECLARED
-#define TkMacResizable_TCL_DECLARED
-/* 44 */
-EXTERN int		TkMacResizable _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-/* Slot 45 is reserved */
-#ifndef TkMacSetHelpMenuItemCount_TCL_DECLARED
-#define TkMacSetHelpMenuItemCount_TCL_DECLARED
-/* 46 */
-EXTERN void		TkMacSetHelpMenuItemCount _ANSI_ARGS_((void));
-#endif
-#ifndef TkMacSetScrollbarGrow_TCL_DECLARED
-#define TkMacSetScrollbarGrow_TCL_DECLARED
-/* 47 */
-EXTERN void		TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow * winPtr, 
-				int flag));
-#endif
-#ifndef TkMacSetUpClippingRgn_TCL_DECLARED
-#define TkMacSetUpClippingRgn_TCL_DECLARED
-/* 48 */
-EXTERN void		TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable));
-#endif
-#ifndef TkMacSetUpGraphicsPort_TCL_DECLARED
-#define TkMacSetUpGraphicsPort_TCL_DECLARED
-/* 49 */
-EXTERN void		TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc));
-#endif
-#ifndef TkMacUpdateClipRgn_TCL_DECLARED
-#define TkMacUpdateClipRgn_TCL_DECLARED
-/* 50 */
-EXTERN void		TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacUnregisterMacWindow_TCL_DECLARED
-#define TkMacUnregisterMacWindow_TCL_DECLARED
-/* 51 */
-EXTERN void		TkMacUnregisterMacWindow _ANSI_ARGS_((
-				GWorldPtr portPtr));
-#endif
-#ifndef TkMacUseMenuID_TCL_DECLARED
-#define TkMacUseMenuID_TCL_DECLARED
-/* 52 */
-EXTERN int		TkMacUseMenuID _ANSI_ARGS_((short macID));
-#endif
-#ifndef TkMacVisableClipRgn_TCL_DECLARED
-#define TkMacVisableClipRgn_TCL_DECLARED
-/* 53 */
-EXTERN RgnHandle	TkMacVisableClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacWinBounds_TCL_DECLARED
-#define TkMacWinBounds_TCL_DECLARED
-/* 54 */
-EXTERN void		TkMacWinBounds _ANSI_ARGS_((TkWindow * winPtr, 
-				Rect * geometry));
-#endif
-#ifndef TkMacWindowOffset_TCL_DECLARED
-#define TkMacWindowOffset_TCL_DECLARED
-/* 55 */
-EXTERN void		TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, 
-				int * xOffset, int * yOffset));
-#endif
-/* Slot 56 is reserved */
-#ifndef TkSetMacColor_TCL_DECLARED
-#define TkSetMacColor_TCL_DECLARED
-/* 57 */
-EXTERN int		TkSetMacColor _ANSI_ARGS_((unsigned long pixel, 
-				RGBColor * macColor));
-#endif
-#ifndef TkSetWMName_TCL_DECLARED
-#define TkSetWMName_TCL_DECLARED
-/* 58 */
-EXTERN void		TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, 
-				Tk_Uid titleUid));
-#endif
-#ifndef TkSuspendClipboard_TCL_DECLARED
-#define TkSuspendClipboard_TCL_DECLARED
-/* 59 */
-EXTERN void		TkSuspendClipboard _ANSI_ARGS_((void));
-#endif
-/* Slot 60 is reserved */
-#ifndef TkMacZoomToplevel_TCL_DECLARED
-#define TkMacZoomToplevel_TCL_DECLARED
-/* 61 */
-EXTERN int		TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, 
-				Point where, short zoomPart));
-#endif
-#ifndef Tk_TopCoordsToWindow_TCL_DECLARED
-#define Tk_TopCoordsToWindow_TCL_DECLARED
-/* 62 */
-EXTERN Tk_Window	Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, 
-				int rootX, int rootY, int * newX, int * newY));
-#endif
-#ifndef TkMacContainerId_TCL_DECLARED
-#define TkMacContainerId_TCL_DECLARED
-/* 63 */
-EXTERN MacDrawable *	TkMacContainerId _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacGetHostToplevel_TCL_DECLARED
-#define TkMacGetHostToplevel_TCL_DECLARED
-/* 64 */
-EXTERN MacDrawable *	TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacPreprocessMenu_TCL_DECLARED
-#define TkMacPreprocessMenu_TCL_DECLARED
-/* 65 */
-EXTERN void		TkMacPreprocessMenu _ANSI_ARGS_((void));
-#endif
-#ifndef TkpIsWindowFloating_TCL_DECLARED
-#define TkpIsWindowFloating_TCL_DECLARED
-/* 66 */
-EXTERN int		TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents_TCL_DECLARED
 #define TkGenerateActivateEvents_TCL_DECLARED
@@ -769,7 +492,7 @@ EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
 #endif
 #endif /* MAC_OSX_TK */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource_TCL_DECLARED
 #define TkCreateXEventSource_TCL_DECLARED
 /* 0 */
@@ -883,75 +606,6 @@ typedef struct TkIntPlatStubs {
     int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */
     void (*tkWinSetHINSTANCE) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
-    void *reserved1;
-    void *reserved2;
-    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */
-    void *reserved4;
-    void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */
-    void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */
-    void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 7 */
-    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 8 */
-    void *reserved9;
-    void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 10 */
-    void *reserved11;
-    void *reserved12;
-    Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 13 */
-    int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 14 */
-    void *reserved15;
-    void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 16 */
-    void *reserved17;
-    unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 18 */
-    void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 19 */
-    void *reserved20;
-    int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 21 */
-    void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 22 */
-    void *reserved23;
-    void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 24 */
-    void *reserved25;
-    void *reserved26;
-    void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 27 */
-    void *reserved28;
-    Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */
-    void *reserved30;
-    TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 31 */
-    Window (*tkMacGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 32 */
-    int (*tkMacGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 33 */
-    void (*tkMacHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 34 */
-    void *reserved35;
-    void *reserved36;
-    void *reserved37;
-    void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 38 */
-    int (*tkMacIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 39 */
-    void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 40 */
-    BitMapPtr (*tkMacMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 41 */
-    void (*tkMacMenuClick) _ANSI_ARGS_((void)); /* 42 */
-    void (*tkMacRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 43 */
-    int (*tkMacResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 44 */
-    void *reserved45;
-    void (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 46 */
-    void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 47 */
-    void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 48 */
-    void (*tkMacSetUpGraphicsPort) _ANSI_ARGS_((GC gc)); /* 49 */
-    void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 50 */
-    void (*tkMacUnregisterMacWindow) _ANSI_ARGS_((GWorldPtr portPtr)); /* 51 */
-    int (*tkMacUseMenuID) _ANSI_ARGS_((short macID)); /* 52 */
-    RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 53 */
-    void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 54 */
-    void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 55 */
-    void *reserved56;
-    int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 57 */
-    void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 58 */
-    void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 59 */
-    void *reserved60;
-    int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 61 */
-    Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 62 */
-    MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 63 */
-    MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 64 */
-    void (*tkMacPreprocessMenu) _ANSI_ARGS_((void)); /* 65 */
-    int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 66 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
     void *reserved1;
@@ -1008,7 +662,7 @@ typedef struct TkIntPlatStubs {
     void *reserved52;
     unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 53 */
 #endif /* MAC_OSX_TK */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */
     void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay * dispPtr, Window w)); /* 1 */
     void (*tkInitXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 2 */
@@ -1178,216 +832,6 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkWinSetHINSTANCE) /* 34 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkGenerateActivateEvents
-#define TkGenerateActivateEvents \
-	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
-#endif
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-#ifndef TkpGetMS
-#define TkpGetMS \
-	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
-#endif
-/* Slot 4 is reserved */
-#ifndef TkPointerDeadWindow
-#define TkPointerDeadWindow \
-	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 5 */
-#endif
-#ifndef TkpSetCapture
-#define TkpSetCapture \
-	(tkIntPlatStubsPtr->tkpSetCapture) /* 6 */
-#endif
-#ifndef TkpSetCursor
-#define TkpSetCursor \
-	(tkIntPlatStubsPtr->tkpSetCursor) /* 7 */
-#endif
-#ifndef TkpWmSetState
-#define TkpWmSetState \
-	(tkIntPlatStubsPtr->tkpWmSetState) /* 8 */
-#endif
-/* Slot 9 is reserved */
-#ifndef TkAboutDlg
-#define TkAboutDlg \
-	(tkIntPlatStubsPtr->tkAboutDlg) /* 10 */
-#endif
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-#ifndef TkGetTransientMaster
-#define TkGetTransientMaster \
-	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 13 */
-#endif
-#ifndef TkGenerateButtonEvent
-#define TkGenerateButtonEvent \
-	(tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 14 */
-#endif
-/* Slot 15 is reserved */
-#ifndef TkGenWMDestroyEvent
-#define TkGenWMDestroyEvent \
-	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 16 */
-#endif
-/* Slot 17 is reserved */
-#ifndef TkMacButtonKeyState
-#define TkMacButtonKeyState \
-	(tkIntPlatStubsPtr->tkMacButtonKeyState) /* 18 */
-#endif
-#ifndef TkMacClearMenubarActive
-#define TkMacClearMenubarActive \
-	(tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 19 */
-#endif
-/* Slot 20 is reserved */
-#ifndef TkMacDispatchMenuEvent
-#define TkMacDispatchMenuEvent \
-	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 21 */
-#endif
-#ifndef TkMacInstallCursor
-#define TkMacInstallCursor \
-	(tkIntPlatStubsPtr->tkMacInstallCursor) /* 22 */
-#endif
-/* Slot 23 is reserved */
-#ifndef TkMacHandleTearoffMenu
-#define TkMacHandleTearoffMenu \
-	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 24 */
-#endif
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-#ifndef TkMacDoHLEvent
-#define TkMacDoHLEvent \
-	(tkIntPlatStubsPtr->tkMacDoHLEvent) /* 27 */
-#endif
-/* Slot 28 is reserved */
-#ifndef TkMacGenerateTime
-#define TkMacGenerateTime \
-	(tkIntPlatStubsPtr->tkMacGenerateTime) /* 29 */
-#endif
-/* Slot 30 is reserved */
-#ifndef TkMacGetScrollbarGrowWindow
-#define TkMacGetScrollbarGrowWindow \
-	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 31 */
-#endif
-#ifndef TkMacGetXWindow
-#define TkMacGetXWindow \
-	(tkIntPlatStubsPtr->tkMacGetXWindow) /* 32 */
-#endif
-#ifndef TkMacGrowToplevel
-#define TkMacGrowToplevel \
-	(tkIntPlatStubsPtr->tkMacGrowToplevel) /* 33 */
-#endif
-#ifndef TkMacHandleMenuSelect
-#define TkMacHandleMenuSelect \
-	(tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 34 */
-#endif
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-#ifndef TkMacInvalidateWindow
-#define TkMacInvalidateWindow \
-	(tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 38 */
-#endif
-#ifndef TkMacIsCharacterMissing
-#define TkMacIsCharacterMissing \
-	(tkIntPlatStubsPtr->tkMacIsCharacterMissing) /* 39 */
-#endif
-#ifndef TkMacMakeRealWindowExist
-#define TkMacMakeRealWindowExist \
-	(tkIntPlatStubsPtr->tkMacMakeRealWindowExist) /* 40 */
-#endif
-#ifndef TkMacMakeStippleMap
-#define TkMacMakeStippleMap \
-	(tkIntPlatStubsPtr->tkMacMakeStippleMap) /* 41 */
-#endif
-#ifndef TkMacMenuClick
-#define TkMacMenuClick \
-	(tkIntPlatStubsPtr->tkMacMenuClick) /* 42 */
-#endif
-#ifndef TkMacRegisterOffScreenWindow
-#define TkMacRegisterOffScreenWindow \
-	(tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow) /* 43 */
-#endif
-#ifndef TkMacResizable
-#define TkMacResizable \
-	(tkIntPlatStubsPtr->tkMacResizable) /* 44 */
-#endif
-/* Slot 45 is reserved */
-#ifndef TkMacSetHelpMenuItemCount
-#define TkMacSetHelpMenuItemCount \
-	(tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 46 */
-#endif
-#ifndef TkMacSetScrollbarGrow
-#define TkMacSetScrollbarGrow \
-	(tkIntPlatStubsPtr->tkMacSetScrollbarGrow) /* 47 */
-#endif
-#ifndef TkMacSetUpClippingRgn
-#define TkMacSetUpClippingRgn \
-	(tkIntPlatStubsPtr->tkMacSetUpClippingRgn) /* 48 */
-#endif
-#ifndef TkMacSetUpGraphicsPort
-#define TkMacSetUpGraphicsPort \
-	(tkIntPlatStubsPtr->tkMacSetUpGraphicsPort) /* 49 */
-#endif
-#ifndef TkMacUpdateClipRgn
-#define TkMacUpdateClipRgn \
-	(tkIntPlatStubsPtr->tkMacUpdateClipRgn) /* 50 */
-#endif
-#ifndef TkMacUnregisterMacWindow
-#define TkMacUnregisterMacWindow \
-	(tkIntPlatStubsPtr->tkMacUnregisterMacWindow) /* 51 */
-#endif
-#ifndef TkMacUseMenuID
-#define TkMacUseMenuID \
-	(tkIntPlatStubsPtr->tkMacUseMenuID) /* 52 */
-#endif
-#ifndef TkMacVisableClipRgn
-#define TkMacVisableClipRgn \
-	(tkIntPlatStubsPtr->tkMacVisableClipRgn) /* 53 */
-#endif
-#ifndef TkMacWinBounds
-#define TkMacWinBounds \
-	(tkIntPlatStubsPtr->tkMacWinBounds) /* 54 */
-#endif
-#ifndef TkMacWindowOffset
-#define TkMacWindowOffset \
-	(tkIntPlatStubsPtr->tkMacWindowOffset) /* 55 */
-#endif
-/* Slot 56 is reserved */
-#ifndef TkSetMacColor
-#define TkSetMacColor \
-	(tkIntPlatStubsPtr->tkSetMacColor) /* 57 */
-#endif
-#ifndef TkSetWMName
-#define TkSetWMName \
-	(tkIntPlatStubsPtr->tkSetWMName) /* 58 */
-#endif
-#ifndef TkSuspendClipboard
-#define TkSuspendClipboard \
-	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 59 */
-#endif
-/* Slot 60 is reserved */
-#ifndef TkMacZoomToplevel
-#define TkMacZoomToplevel \
-	(tkIntPlatStubsPtr->tkMacZoomToplevel) /* 61 */
-#endif
-#ifndef Tk_TopCoordsToWindow
-#define Tk_TopCoordsToWindow \
-	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 62 */
-#endif
-#ifndef TkMacContainerId
-#define TkMacContainerId \
-	(tkIntPlatStubsPtr->tkMacContainerId) /* 63 */
-#endif
-#ifndef TkMacGetHostToplevel
-#define TkMacGetHostToplevel \
-	(tkIntPlatStubsPtr->tkMacGetHostToplevel) /* 64 */
-#endif
-#ifndef TkMacPreprocessMenu
-#define TkMacPreprocessMenu \
-	(tkIntPlatStubsPtr->tkMacPreprocessMenu) /* 65 */
-#endif
-#ifndef TkpIsWindowFloating
-#define TkpIsWindowFloating \
-	(tkIntPlatStubsPtr->tkpIsWindowFloating) /* 66 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
@@ -1582,7 +1026,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
 #endif
 #endif /* MAC_OSX_TK */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 9e1e8e7..060cfc2 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,17 +9,13 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.17 2003/10/13 03:41:37 hobbs Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.18 2004/03/17 18:15:43 das Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
 #define _TKINTXLIBDECLS
 
-#ifdef MAC_TCL
-#include "Xutil.h"
-#else
 #include "X11/Xutil.h"
-#endif
 
 #ifdef BUILD_tk
 #undef TCL_STORAGE_CLASS
@@ -684,569 +680,6 @@ EXTERN void		XFillRectangle _ANSI_ARGS_((Display* display,
 				unsigned int width, unsigned int height));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef XSetDashes_TCL_DECLARED
-#define XSetDashes_TCL_DECLARED
-/* 0 */
-EXTERN void		XSetDashes _ANSI_ARGS_((Display* display, GC gc, 
-				int dash_offset, _Xconst char* dash_list, 
-				int n));
-#endif
-#ifndef XGetModifierMapping_TCL_DECLARED
-#define XGetModifierMapping_TCL_DECLARED
-/* 1 */
-EXTERN XModifierKeymap*	 XGetModifierMapping _ANSI_ARGS_((Display* d));
-#endif
-#ifndef XCreateImage_TCL_DECLARED
-#define XCreateImage_TCL_DECLARED
-/* 2 */
-EXTERN 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));
-#endif
-#ifndef XGetImage_TCL_DECLARED
-#define XGetImage_TCL_DECLARED
-/* 3 */
-EXTERN XImage *		XGetImage _ANSI_ARGS_((Display* d, Drawable dr, 
-				int i1, int i2, unsigned int ui1, 
-				unsigned int ui2, unsigned long ul, int i3));
-#endif
-#ifndef XGetAtomName_TCL_DECLARED
-#define XGetAtomName_TCL_DECLARED
-/* 4 */
-EXTERN char *		XGetAtomName _ANSI_ARGS_((Display* d, Atom a));
-#endif
-#ifndef XKeysymToString_TCL_DECLARED
-#define XKeysymToString_TCL_DECLARED
-/* 5 */
-EXTERN char *		XKeysymToString _ANSI_ARGS_((KeySym k));
-#endif
-#ifndef XCreateColormap_TCL_DECLARED
-#define XCreateColormap_TCL_DECLARED
-/* 6 */
-EXTERN Colormap		XCreateColormap _ANSI_ARGS_((Display* d, Window w, 
-				Visual* v, int i));
-#endif
-#ifndef XGContextFromGC_TCL_DECLARED
-#define XGContextFromGC_TCL_DECLARED
-/* 7 */
-EXTERN GContext		XGContextFromGC _ANSI_ARGS_((GC g));
-#endif
-#ifndef XKeycodeToKeysym_TCL_DECLARED
-#define XKeycodeToKeysym_TCL_DECLARED
-/* 8 */
-EXTERN KeySym		XKeycodeToKeysym _ANSI_ARGS_((Display* d, KeyCode k, 
-				int i));
-#endif
-#ifndef XStringToKeysym_TCL_DECLARED
-#define XStringToKeysym_TCL_DECLARED
-/* 9 */
-EXTERN KeySym		XStringToKeysym _ANSI_ARGS_((_Xconst char* c));
-#endif
-#ifndef XRootWindow_TCL_DECLARED
-#define XRootWindow_TCL_DECLARED
-/* 10 */
-EXTERN Window		XRootWindow _ANSI_ARGS_((Display* d, int i));
-#endif
-#ifndef XSetErrorHandler_TCL_DECLARED
-#define XSetErrorHandler_TCL_DECLARED
-/* 11 */
-EXTERN XErrorHandler	XSetErrorHandler _ANSI_ARGS_((XErrorHandler x));
-#endif
-#ifndef XAllocColor_TCL_DECLARED
-#define XAllocColor_TCL_DECLARED
-/* 12 */
-EXTERN Status		XAllocColor _ANSI_ARGS_((Display* d, Colormap c, 
-				XColor* xp));
-#endif
-#ifndef XBell_TCL_DECLARED
-#define XBell_TCL_DECLARED
-/* 13 */
-EXTERN void		XBell _ANSI_ARGS_((Display* d, int i));
-#endif
-#ifndef XChangeProperty_TCL_DECLARED
-#define XChangeProperty_TCL_DECLARED
-/* 14 */
-EXTERN void		XChangeProperty _ANSI_ARGS_((Display* d, Window w, 
-				Atom a1, Atom a2, int i1, int i2, 
-				_Xconst unsigned char* c, int i3));
-#endif
-#ifndef XChangeWindowAttributes_TCL_DECLARED
-#define XChangeWindowAttributes_TCL_DECLARED
-/* 15 */
-EXTERN void		XChangeWindowAttributes _ANSI_ARGS_((Display* d, 
-				Window w, unsigned long ul, 
-				XSetWindowAttributes* x));
-#endif
-#ifndef XConfigureWindow_TCL_DECLARED
-#define XConfigureWindow_TCL_DECLARED
-/* 16 */
-EXTERN void		XConfigureWindow _ANSI_ARGS_((Display* d, Window w, 
-				unsigned int i, XWindowChanges* x));
-#endif
-#ifndef XCopyArea_TCL_DECLARED
-#define XCopyArea_TCL_DECLARED
-/* 17 */
-EXTERN void		XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, 
-				Drawable dr2, GC g, int i1, int i2, 
-				unsigned int ui1, unsigned int ui2, int i3, 
-				int i4));
-#endif
-#ifndef XCopyPlane_TCL_DECLARED
-#define XCopyPlane_TCL_DECLARED
-/* 18 */
-EXTERN void		XCopyPlane _ANSI_ARGS_((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));
-#endif
-#ifndef XCreateBitmapFromData_TCL_DECLARED
-#define XCreateBitmapFromData_TCL_DECLARED
-/* 19 */
-EXTERN Pixmap		XCreateBitmapFromData _ANSI_ARGS_((Display* display, 
-				Drawable d, _Xconst char* data, 
-				unsigned int width, unsigned int height));
-#endif
-#ifndef XDefineCursor_TCL_DECLARED
-#define XDefineCursor_TCL_DECLARED
-/* 20 */
-EXTERN void		XDefineCursor _ANSI_ARGS_((Display* d, Window w, 
-				Cursor c));
-#endif
-#ifndef XDestroyWindow_TCL_DECLARED
-#define XDestroyWindow_TCL_DECLARED
-/* 21 */
-EXTERN void		XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
-#endif
-#ifndef XDrawArc_TCL_DECLARED
-#define XDrawArc_TCL_DECLARED
-/* 22 */
-EXTERN void		XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
-				int i1, int i2, unsigned int ui1, 
-				unsigned int ui2, int i3, int i4));
-#endif
-#ifndef XDrawLines_TCL_DECLARED
-#define XDrawLines_TCL_DECLARED
-/* 23 */
-EXTERN void		XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XPoint* x, int i1, int i2));
-#endif
-#ifndef XDrawRectangle_TCL_DECLARED
-#define XDrawRectangle_TCL_DECLARED
-/* 24 */
-EXTERN void		XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, int i1, int i2, unsigned int ui1, 
-				unsigned int ui2));
-#endif
-#ifndef XFillArc_TCL_DECLARED
-#define XFillArc_TCL_DECLARED
-/* 25 */
-EXTERN void		XFillArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
-				int i1, int i2, unsigned int ui1, 
-				unsigned int ui2, int i3, int i4));
-#endif
-#ifndef XFillPolygon_TCL_DECLARED
-#define XFillPolygon_TCL_DECLARED
-/* 26 */
-EXTERN void		XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XPoint* x, int i1, int i2, int i3));
-#endif
-#ifndef XFillRectangles_TCL_DECLARED
-#define XFillRectangles_TCL_DECLARED
-/* 27 */
-EXTERN void		XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XRectangle* x, int i));
-#endif
-#ifndef XFreeColormap_TCL_DECLARED
-#define XFreeColormap_TCL_DECLARED
-/* 28 */
-EXTERN void		XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
-#endif
-#ifndef XFreeColors_TCL_DECLARED
-#define XFreeColors_TCL_DECLARED
-/* 29 */
-EXTERN void		XFreeColors _ANSI_ARGS_((Display* d, Colormap c, 
-				unsigned long* ulp, int i, unsigned long ul));
-#endif
-#ifndef XFreeModifiermap_TCL_DECLARED
-#define XFreeModifiermap_TCL_DECLARED
-/* 30 */
-EXTERN void		XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x));
-#endif
-#ifndef XGetGeometry_TCL_DECLARED
-#define XGetGeometry_TCL_DECLARED
-/* 31 */
-EXTERN Status		XGetGeometry _ANSI_ARGS_((Display* d, Drawable dr, 
-				Window* w, int* i1, int* i2, 
-				unsigned int* ui1, unsigned int* ui2, 
-				unsigned int* ui3, unsigned int* ui4));
-#endif
-#ifndef XGetWindowProperty_TCL_DECLARED
-#define XGetWindowProperty_TCL_DECLARED
-/* 32 */
-EXTERN int		XGetWindowProperty _ANSI_ARGS_((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));
-#endif
-#ifndef XGrabKeyboard_TCL_DECLARED
-#define XGrabKeyboard_TCL_DECLARED
-/* 33 */
-EXTERN int		XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, 
-				Bool b, int i1, int i2, Time t));
-#endif
-#ifndef XGrabPointer_TCL_DECLARED
-#define XGrabPointer_TCL_DECLARED
-/* 34 */
-EXTERN int		XGrabPointer _ANSI_ARGS_((Display* d, Window w1, 
-				Bool b, unsigned int ui, int i1, int i2, 
-				Window w2, Cursor c, Time t));
-#endif
-#ifndef XKeysymToKeycode_TCL_DECLARED
-#define XKeysymToKeycode_TCL_DECLARED
-/* 35 */
-EXTERN KeyCode		XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k));
-#endif
-#ifndef XMapWindow_TCL_DECLARED
-#define XMapWindow_TCL_DECLARED
-/* 36 */
-EXTERN void		XMapWindow _ANSI_ARGS_((Display* d, Window w));
-#endif
-#ifndef XMoveResizeWindow_TCL_DECLARED
-#define XMoveResizeWindow_TCL_DECLARED
-/* 37 */
-EXTERN void		XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, 
-				int i1, int i2, unsigned int ui1, 
-				unsigned int ui2));
-#endif
-#ifndef XMoveWindow_TCL_DECLARED
-#define XMoveWindow_TCL_DECLARED
-/* 38 */
-EXTERN void		XMoveWindow _ANSI_ARGS_((Display* d, Window w, 
-				int i1, int i2));
-#endif
-#ifndef XQueryPointer_TCL_DECLARED
-#define XQueryPointer_TCL_DECLARED
-/* 39 */
-EXTERN Bool		XQueryPointer _ANSI_ARGS_((Display* d, Window w1, 
-				Window* w2, Window* w3, int* i1, int* i2, 
-				int* i3, int* i4, unsigned int* ui));
-#endif
-#ifndef XRaiseWindow_TCL_DECLARED
-#define XRaiseWindow_TCL_DECLARED
-/* 40 */
-EXTERN void		XRaiseWindow _ANSI_ARGS_((Display* d, Window w));
-#endif
-#ifndef XRefreshKeyboardMapping_TCL_DECLARED
-#define XRefreshKeyboardMapping_TCL_DECLARED
-/* 41 */
-EXTERN void		XRefreshKeyboardMapping _ANSI_ARGS_((
-				XMappingEvent* x));
-#endif
-#ifndef XResizeWindow_TCL_DECLARED
-#define XResizeWindow_TCL_DECLARED
-/* 42 */
-EXTERN void		XResizeWindow _ANSI_ARGS_((Display* d, Window w, 
-				unsigned int ui1, unsigned int ui2));
-#endif
-#ifndef XSelectInput_TCL_DECLARED
-#define XSelectInput_TCL_DECLARED
-/* 43 */
-EXTERN void		XSelectInput _ANSI_ARGS_((Display* d, Window w, 
-				long l));
-#endif
-#ifndef XSendEvent_TCL_DECLARED
-#define XSendEvent_TCL_DECLARED
-/* 44 */
-EXTERN Status		XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, 
-				long l, XEvent* x));
-#endif
-#ifndef XSetIconName_TCL_DECLARED
-#define XSetIconName_TCL_DECLARED
-/* 45 */
-EXTERN void		XSetIconName _ANSI_ARGS_((Display* d, Window w, 
-				_Xconst char* c));
-#endif
-#ifndef XSetInputFocus_TCL_DECLARED
-#define XSetInputFocus_TCL_DECLARED
-/* 46 */
-EXTERN void		XSetInputFocus _ANSI_ARGS_((Display* d, Window w, 
-				int i, Time t));
-#endif
-#ifndef XSetSelectionOwner_TCL_DECLARED
-#define XSetSelectionOwner_TCL_DECLARED
-/* 47 */
-EXTERN void		XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, 
-				Window w, Time t));
-#endif
-#ifndef XSetWindowBackground_TCL_DECLARED
-#define XSetWindowBackground_TCL_DECLARED
-/* 48 */
-EXTERN void		XSetWindowBackground _ANSI_ARGS_((Display* d, 
-				Window w, unsigned long ul));
-#endif
-#ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
-#define XSetWindowBackgroundPixmap_TCL_DECLARED
-/* 49 */
-EXTERN void		XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, 
-				Window w, Pixmap p));
-#endif
-#ifndef XSetWindowBorder_TCL_DECLARED
-#define XSetWindowBorder_TCL_DECLARED
-/* 50 */
-EXTERN void		XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, 
-				unsigned long ul));
-#endif
-#ifndef XSetWindowBorderPixmap_TCL_DECLARED
-#define XSetWindowBorderPixmap_TCL_DECLARED
-/* 51 */
-EXTERN void		XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, 
-				Window w, Pixmap p));
-#endif
-#ifndef XSetWindowBorderWidth_TCL_DECLARED
-#define XSetWindowBorderWidth_TCL_DECLARED
-/* 52 */
-EXTERN void		XSetWindowBorderWidth _ANSI_ARGS_((Display* d, 
-				Window w, unsigned int ui));
-#endif
-#ifndef XSetWindowColormap_TCL_DECLARED
-#define XSetWindowColormap_TCL_DECLARED
-/* 53 */
-EXTERN void		XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, 
-				Colormap c));
-#endif
-#ifndef XUngrabKeyboard_TCL_DECLARED
-#define XUngrabKeyboard_TCL_DECLARED
-/* 54 */
-EXTERN void		XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
-#endif
-#ifndef XUngrabPointer_TCL_DECLARED
-#define XUngrabPointer_TCL_DECLARED
-/* 55 */
-EXTERN void		XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
-#endif
-#ifndef XUnmapWindow_TCL_DECLARED
-#define XUnmapWindow_TCL_DECLARED
-/* 56 */
-EXTERN void		XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
-#endif
-#ifndef TkPutImage_TCL_DECLARED
-#define TkPutImage_TCL_DECLARED
-/* 57 */
-EXTERN void		TkPutImage _ANSI_ARGS_((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));
-#endif
-#ifndef XParseColor_TCL_DECLARED
-#define XParseColor_TCL_DECLARED
-/* 58 */
-EXTERN Status		XParseColor _ANSI_ARGS_((Display * display, 
-				Colormap map, _Xconst char* spec, 
-				XColor * colorPtr));
-#endif
-#ifndef XCreateGC_TCL_DECLARED
-#define XCreateGC_TCL_DECLARED
-/* 59 */
-EXTERN GC		XCreateGC _ANSI_ARGS_((Display* display, Drawable d, 
-				unsigned long valuemask, XGCValues* values));
-#endif
-#ifndef XFreeGC_TCL_DECLARED
-#define XFreeGC_TCL_DECLARED
-/* 60 */
-EXTERN void		XFreeGC _ANSI_ARGS_((Display* display, GC gc));
-#endif
-#ifndef XInternAtom_TCL_DECLARED
-#define XInternAtom_TCL_DECLARED
-/* 61 */
-EXTERN Atom		XInternAtom _ANSI_ARGS_((Display* display, 
-				_Xconst char* atom_name, Bool only_if_exists));
-#endif
-#ifndef XSetBackground_TCL_DECLARED
-#define XSetBackground_TCL_DECLARED
-/* 62 */
-EXTERN void		XSetBackground _ANSI_ARGS_((Display* display, GC gc, 
-				unsigned long foreground));
-#endif
-#ifndef XSetForeground_TCL_DECLARED
-#define XSetForeground_TCL_DECLARED
-/* 63 */
-EXTERN void		XSetForeground _ANSI_ARGS_((Display* display, GC gc, 
-				unsigned long foreground));
-#endif
-#ifndef XSetClipMask_TCL_DECLARED
-#define XSetClipMask_TCL_DECLARED
-/* 64 */
-EXTERN void		XSetClipMask _ANSI_ARGS_((Display* display, GC gc, 
-				Pixmap pixmap));
-#endif
-#ifndef XSetClipOrigin_TCL_DECLARED
-#define XSetClipOrigin_TCL_DECLARED
-/* 65 */
-EXTERN void		XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, 
-				int clip_x_origin, int clip_y_origin));
-#endif
-#ifndef XSetTSOrigin_TCL_DECLARED
-#define XSetTSOrigin_TCL_DECLARED
-/* 66 */
-EXTERN void		XSetTSOrigin _ANSI_ARGS_((Display* display, GC gc, 
-				int ts_x_origin, int ts_y_origin));
-#endif
-#ifndef XChangeGC_TCL_DECLARED
-#define XChangeGC_TCL_DECLARED
-/* 67 */
-EXTERN void		XChangeGC _ANSI_ARGS_((Display * d, GC gc, 
-				unsigned long mask, XGCValues * values));
-#endif
-#ifndef XSetFont_TCL_DECLARED
-#define XSetFont_TCL_DECLARED
-/* 68 */
-EXTERN void		XSetFont _ANSI_ARGS_((Display * display, GC gc, 
-				Font font));
-#endif
-#ifndef XSetArcMode_TCL_DECLARED
-#define XSetArcMode_TCL_DECLARED
-/* 69 */
-EXTERN void		XSetArcMode _ANSI_ARGS_((Display * display, GC gc, 
-				int arc_mode));
-#endif
-#ifndef XSetStipple_TCL_DECLARED
-#define XSetStipple_TCL_DECLARED
-/* 70 */
-EXTERN void		XSetStipple _ANSI_ARGS_((Display * display, GC gc, 
-				Pixmap stipple));
-#endif
-#ifndef XSetFillRule_TCL_DECLARED
-#define XSetFillRule_TCL_DECLARED
-/* 71 */
-EXTERN void		XSetFillRule _ANSI_ARGS_((Display * display, GC gc, 
-				int fill_rule));
-#endif
-#ifndef XSetFillStyle_TCL_DECLARED
-#define XSetFillStyle_TCL_DECLARED
-/* 72 */
-EXTERN void		XSetFillStyle _ANSI_ARGS_((Display * display, GC gc, 
-				int fill_style));
-#endif
-#ifndef XSetFunction_TCL_DECLARED
-#define XSetFunction_TCL_DECLARED
-/* 73 */
-EXTERN void		XSetFunction _ANSI_ARGS_((Display * display, GC gc, 
-				int function));
-#endif
-#ifndef XSetLineAttributes_TCL_DECLARED
-#define XSetLineAttributes_TCL_DECLARED
-/* 74 */
-EXTERN void		XSetLineAttributes _ANSI_ARGS_((Display * display, 
-				GC gc, unsigned int line_width, 
-				int line_style, int cap_style, 
-				int join_style));
-#endif
-#ifndef _XInitImageFuncPtrs_TCL_DECLARED
-#define _XInitImageFuncPtrs_TCL_DECLARED
-/* 75 */
-EXTERN int		_XInitImageFuncPtrs _ANSI_ARGS_((XImage * image));
-#endif
-#ifndef XCreateIC_TCL_DECLARED
-#define XCreateIC_TCL_DECLARED
-/* 76 */
-EXTERN XIC		XCreateIC _ANSI_ARGS_((void));
-#endif
-#ifndef XGetVisualInfo_TCL_DECLARED
-#define XGetVisualInfo_TCL_DECLARED
-/* 77 */
-EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display* display, 
-				long vinfo_mask, XVisualInfo* vinfo_template, 
-				int* nitems_return));
-#endif
-#ifndef XSetWMClientMachine_TCL_DECLARED
-#define XSetWMClientMachine_TCL_DECLARED
-/* 78 */
-EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display* display, 
-				Window w, XTextProperty* text_prop));
-#endif
-#ifndef XStringListToTextProperty_TCL_DECLARED
-#define XStringListToTextProperty_TCL_DECLARED
-/* 79 */
-EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char** list, 
-				int count, XTextProperty* text_prop_return));
-#endif
-#ifndef XDrawSegments_TCL_DECLARED
-#define XDrawSegments_TCL_DECLARED
-/* 80 */
-EXTERN void		XDrawSegments _ANSI_ARGS_((Display * display, 
-				Drawable d, GC gc, XSegment * segments, 
-				int nsegments));
-#endif
-#ifndef XForceScreenSaver_TCL_DECLARED
-#define XForceScreenSaver_TCL_DECLARED
-/* 81 */
-EXTERN void		XForceScreenSaver _ANSI_ARGS_((Display* display, 
-				int mode));
-#endif
-#ifndef XDrawLine_TCL_DECLARED
-#define XDrawLine_TCL_DECLARED
-/* 82 */
-EXTERN void		XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
-				int x1, int y1, int x2, int y2));
-#endif
-#ifndef XFillRectangle_TCL_DECLARED
-#define XFillRectangle_TCL_DECLARED
-/* 83 */
-EXTERN void		XFillRectangle _ANSI_ARGS_((Display* display, 
-				Drawable d, GC gc, int x, int y, 
-				unsigned int width, unsigned int height));
-#endif
-#ifndef XClearWindow_TCL_DECLARED
-#define XClearWindow_TCL_DECLARED
-/* 84 */
-EXTERN void		XClearWindow _ANSI_ARGS_((Display* d, Window w));
-#endif
-#ifndef XDrawPoint_TCL_DECLARED
-#define XDrawPoint_TCL_DECLARED
-/* 85 */
-EXTERN void		XDrawPoint _ANSI_ARGS_((Display* display, Drawable d, 
-				GC gc, int x, int y));
-#endif
-#ifndef XDrawPoints_TCL_DECLARED
-#define XDrawPoints_TCL_DECLARED
-/* 86 */
-EXTERN void		XDrawPoints _ANSI_ARGS_((Display* display, 
-				Drawable d, GC gc, XPoint * points, 
-				int npoints, int mode));
-#endif
-#ifndef XWarpPointer_TCL_DECLARED
-#define XWarpPointer_TCL_DECLARED
-/* 87 */
-EXTERN 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));
-#endif
-#ifndef XQueryColor_TCL_DECLARED
-#define XQueryColor_TCL_DECLARED
-/* 88 */
-EXTERN void		XQueryColor _ANSI_ARGS_((Display * display, 
-				Colormap colormap, XColor * def_in_out));
-#endif
-#ifndef XQueryColors_TCL_DECLARED
-#define XQueryColors_TCL_DECLARED
-/* 89 */
-EXTERN void		XQueryColors _ANSI_ARGS_((Display * display, 
-				Colormap colormap, XColor * defs_in_out, 
-				int ncolors));
-#endif
-#ifndef XQueryTree_TCL_DECLARED
-#define XQueryTree_TCL_DECLARED
-/* 90 */
-EXTERN Status		XQueryTree _ANSI_ARGS_((Display* d, Window w1, 
-				Window* w2, Window* w3, Window** w4, 
-				unsigned int* ui));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
@@ -1924,99 +1357,6 @@ typedef struct TkIntXlibStubs {
     void (*xWarpPointer) _ANSI_ARGS_((Display* d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */
     void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    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 */
-    XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */
-    char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */
-    char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */
-    Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */
-    GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */
-    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 8 */
-    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 9 */
-    Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 10 */
-    XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */
-    Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 12 */
-    void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 13 */
-    void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 14 */
-    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 15 */
-    void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 16 */
-    void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */
-    void (*xCopyPlane) _ANSI_ARGS_((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)); /* 18 */
-    Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 19 */
-    void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 20 */
-    void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 21 */
-    void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */
-    void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 23 */
-    void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */
-    void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */
-    void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 26 */
-    void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 27 */
-    void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 28 */
-    void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 29 */
-    void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 30 */
-    Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 31 */
-    int (*xGetWindowProperty) _ANSI_ARGS_((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)); /* 32 */
-    int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */
-    int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */
-    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 35 */
-    void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 36 */
-    void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */
-    void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 38 */
-    Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 39 */
-    void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 40 */
-    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 41 */
-    void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */
-    void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 43 */
-    Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 44 */
-    void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 45 */
-    void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 46 */
-    void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 47 */
-    void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 48 */
-    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 49 */
-    void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 50 */
-    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 51 */
-    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 52 */
-    void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 53 */
-    void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 54 */
-    void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 55 */
-    void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */
-    void (*tkPutImage) _ANSI_ARGS_((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)); /* 57 */
-    Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 58 */
-    GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 59 */
-    void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 60 */
-    Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 61 */
-    void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 62 */
-    void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 63 */
-    void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 64 */
-    void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
-    void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
-    void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 67 */
-    void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 68 */
-    void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 69 */
-    void (*xSetStipple) _ANSI_ARGS_((Display * display, GC gc, Pixmap stipple)); /* 70 */
-    void (*xSetFillRule) _ANSI_ARGS_((Display * display, GC gc, int fill_rule)); /* 71 */
-    void (*xSetFillStyle) _ANSI_ARGS_((Display * display, GC gc, int fill_style)); /* 72 */
-    void (*xSetFunction) _ANSI_ARGS_((Display * display, GC gc, int function)); /* 73 */
-    void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
-    int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 75 */
-    XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */
-    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 77 */
-    void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 78 */
-    Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */
-    void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */
-    void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */
-    void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
-    void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */
-    void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 84 */
-    void (*xDrawPoint) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y)); /* 85 */
-    void (*xDrawPoints) _ANSI_ARGS_((Display* display, Drawable d, GC gc, XPoint * points, int npoints, int mode)); /* 86 */
-    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 */
-    Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 90 */
-#endif /* MAC_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 */
@@ -2553,372 +1893,6 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xFillRectangle) /* 106 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef XSetDashes
-#define XSetDashes \
-	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
-#endif
-#ifndef XGetModifierMapping
-#define XGetModifierMapping \
-	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
-#endif
-#ifndef XCreateImage
-#define XCreateImage \
-	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
-#endif
-#ifndef XGetImage
-#define XGetImage \
-	(tkIntXlibStubsPtr->xGetImage) /* 3 */
-#endif
-#ifndef XGetAtomName
-#define XGetAtomName \
-	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
-#endif
-#ifndef XKeysymToString
-#define XKeysymToString \
-	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
-#endif
-#ifndef XCreateColormap
-#define XCreateColormap \
-	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
-#endif
-#ifndef XGContextFromGC
-#define XGContextFromGC \
-	(tkIntXlibStubsPtr->xGContextFromGC) /* 7 */
-#endif
-#ifndef XKeycodeToKeysym
-#define XKeycodeToKeysym \
-	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */
-#endif
-#ifndef XStringToKeysym
-#define XStringToKeysym \
-	(tkIntXlibStubsPtr->xStringToKeysym) /* 9 */
-#endif
-#ifndef XRootWindow
-#define XRootWindow \
-	(tkIntXlibStubsPtr->xRootWindow) /* 10 */
-#endif
-#ifndef XSetErrorHandler
-#define XSetErrorHandler \
-	(tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */
-#endif
-#ifndef XAllocColor
-#define XAllocColor \
-	(tkIntXlibStubsPtr->xAllocColor) /* 12 */
-#endif
-#ifndef XBell
-#define XBell \
-	(tkIntXlibStubsPtr->xBell) /* 13 */
-#endif
-#ifndef XChangeProperty
-#define XChangeProperty \
-	(tkIntXlibStubsPtr->xChangeProperty) /* 14 */
-#endif
-#ifndef XChangeWindowAttributes
-#define XChangeWindowAttributes \
-	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */
-#endif
-#ifndef XConfigureWindow
-#define XConfigureWindow \
-	(tkIntXlibStubsPtr->xConfigureWindow) /* 16 */
-#endif
-#ifndef XCopyArea
-#define XCopyArea \
-	(tkIntXlibStubsPtr->xCopyArea) /* 17 */
-#endif
-#ifndef XCopyPlane
-#define XCopyPlane \
-	(tkIntXlibStubsPtr->xCopyPlane) /* 18 */
-#endif
-#ifndef XCreateBitmapFromData
-#define XCreateBitmapFromData \
-	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */
-#endif
-#ifndef XDefineCursor
-#define XDefineCursor \
-	(tkIntXlibStubsPtr->xDefineCursor) /* 20 */
-#endif
-#ifndef XDestroyWindow
-#define XDestroyWindow \
-	(tkIntXlibStubsPtr->xDestroyWindow) /* 21 */
-#endif
-#ifndef XDrawArc
-#define XDrawArc \
-	(tkIntXlibStubsPtr->xDrawArc) /* 22 */
-#endif
-#ifndef XDrawLines
-#define XDrawLines \
-	(tkIntXlibStubsPtr->xDrawLines) /* 23 */
-#endif
-#ifndef XDrawRectangle
-#define XDrawRectangle \
-	(tkIntXlibStubsPtr->xDrawRectangle) /* 24 */
-#endif
-#ifndef XFillArc
-#define XFillArc \
-	(tkIntXlibStubsPtr->xFillArc) /* 25 */
-#endif
-#ifndef XFillPolygon
-#define XFillPolygon \
-	(tkIntXlibStubsPtr->xFillPolygon) /* 26 */
-#endif
-#ifndef XFillRectangles
-#define XFillRectangles \
-	(tkIntXlibStubsPtr->xFillRectangles) /* 27 */
-#endif
-#ifndef XFreeColormap
-#define XFreeColormap \
-	(tkIntXlibStubsPtr->xFreeColormap) /* 28 */
-#endif
-#ifndef XFreeColors
-#define XFreeColors \
-	(tkIntXlibStubsPtr->xFreeColors) /* 29 */
-#endif
-#ifndef XFreeModifiermap
-#define XFreeModifiermap \
-	(tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */
-#endif
-#ifndef XGetGeometry
-#define XGetGeometry \
-	(tkIntXlibStubsPtr->xGetGeometry) /* 31 */
-#endif
-#ifndef XGetWindowProperty
-#define XGetWindowProperty \
-	(tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */
-#endif
-#ifndef XGrabKeyboard
-#define XGrabKeyboard \
-	(tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */
-#endif
-#ifndef XGrabPointer
-#define XGrabPointer \
-	(tkIntXlibStubsPtr->xGrabPointer) /* 34 */
-#endif
-#ifndef XKeysymToKeycode
-#define XKeysymToKeycode \
-	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */
-#endif
-#ifndef XMapWindow
-#define XMapWindow \
-	(tkIntXlibStubsPtr->xMapWindow) /* 36 */
-#endif
-#ifndef XMoveResizeWindow
-#define XMoveResizeWindow \
-	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */
-#endif
-#ifndef XMoveWindow
-#define XMoveWindow \
-	(tkIntXlibStubsPtr->xMoveWindow) /* 38 */
-#endif
-#ifndef XQueryPointer
-#define XQueryPointer \
-	(tkIntXlibStubsPtr->xQueryPointer) /* 39 */
-#endif
-#ifndef XRaiseWindow
-#define XRaiseWindow \
-	(tkIntXlibStubsPtr->xRaiseWindow) /* 40 */
-#endif
-#ifndef XRefreshKeyboardMapping
-#define XRefreshKeyboardMapping \
-	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */
-#endif
-#ifndef XResizeWindow
-#define XResizeWindow \
-	(tkIntXlibStubsPtr->xResizeWindow) /* 42 */
-#endif
-#ifndef XSelectInput
-#define XSelectInput \
-	(tkIntXlibStubsPtr->xSelectInput) /* 43 */
-#endif
-#ifndef XSendEvent
-#define XSendEvent \
-	(tkIntXlibStubsPtr->xSendEvent) /* 44 */
-#endif
-#ifndef XSetIconName
-#define XSetIconName \
-	(tkIntXlibStubsPtr->xSetIconName) /* 45 */
-#endif
-#ifndef XSetInputFocus
-#define XSetInputFocus \
-	(tkIntXlibStubsPtr->xSetInputFocus) /* 46 */
-#endif
-#ifndef XSetSelectionOwner
-#define XSetSelectionOwner \
-	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */
-#endif
-#ifndef XSetWindowBackground
-#define XSetWindowBackground \
-	(tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */
-#endif
-#ifndef XSetWindowBackgroundPixmap
-#define XSetWindowBackgroundPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */
-#endif
-#ifndef XSetWindowBorder
-#define XSetWindowBorder \
-	(tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */
-#endif
-#ifndef XSetWindowBorderPixmap
-#define XSetWindowBorderPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */
-#endif
-#ifndef XSetWindowBorderWidth
-#define XSetWindowBorderWidth \
-	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */
-#endif
-#ifndef XSetWindowColormap
-#define XSetWindowColormap \
-	(tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */
-#endif
-#ifndef XUngrabKeyboard
-#define XUngrabKeyboard \
-	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */
-#endif
-#ifndef XUngrabPointer
-#define XUngrabPointer \
-	(tkIntXlibStubsPtr->xUngrabPointer) /* 55 */
-#endif
-#ifndef XUnmapWindow
-#define XUnmapWindow \
-	(tkIntXlibStubsPtr->xUnmapWindow) /* 56 */
-#endif
-#ifndef TkPutImage
-#define TkPutImage \
-	(tkIntXlibStubsPtr->tkPutImage) /* 57 */
-#endif
-#ifndef XParseColor
-#define XParseColor \
-	(tkIntXlibStubsPtr->xParseColor) /* 58 */
-#endif
-#ifndef XCreateGC
-#define XCreateGC \
-	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
-#endif
-#ifndef XFreeGC
-#define XFreeGC \
-	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
-#endif
-#ifndef XInternAtom
-#define XInternAtom \
-	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
-#endif
-#ifndef XSetBackground
-#define XSetBackground \
-	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
-#endif
-#ifndef XSetForeground
-#define XSetForeground \
-	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
-#endif
-#ifndef XSetClipMask
-#define XSetClipMask \
-	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
-#endif
-#ifndef XSetClipOrigin
-#define XSetClipOrigin \
-	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
-#endif
-#ifndef XSetTSOrigin
-#define XSetTSOrigin \
-	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
-#endif
-#ifndef XChangeGC
-#define XChangeGC \
-	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
-#endif
-#ifndef XSetFont
-#define XSetFont \
-	(tkIntXlibStubsPtr->xSetFont) /* 68 */
-#endif
-#ifndef XSetArcMode
-#define XSetArcMode \
-	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
-#endif
-#ifndef XSetStipple
-#define XSetStipple \
-	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
-#endif
-#ifndef XSetFillRule
-#define XSetFillRule \
-	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
-#endif
-#ifndef XSetFillStyle
-#define XSetFillStyle \
-	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
-#endif
-#ifndef XSetFunction
-#define XSetFunction \
-	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
-#endif
-#ifndef XSetLineAttributes
-#define XSetLineAttributes \
-	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
-#endif
-#ifndef _XInitImageFuncPtrs
-#define _XInitImageFuncPtrs \
-	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
-#endif
-#ifndef XCreateIC
-#define XCreateIC \
-	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
-#endif
-#ifndef XGetVisualInfo
-#define XGetVisualInfo \
-	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
-#endif
-#ifndef XSetWMClientMachine
-#define XSetWMClientMachine \
-	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
-#endif
-#ifndef XStringListToTextProperty
-#define XStringListToTextProperty \
-	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
-#endif
-#ifndef XDrawSegments
-#define XDrawSegments \
-	(tkIntXlibStubsPtr->xDrawSegments) /* 80 */
-#endif
-#ifndef XForceScreenSaver
-#define XForceScreenSaver \
-	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
-#endif
-#ifndef XDrawLine
-#define XDrawLine \
-	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
-#endif
-#ifndef XFillRectangle
-#define XFillRectangle \
-	(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
-#endif
-#ifndef XClearWindow
-#define XClearWindow \
-	(tkIntXlibStubsPtr->xClearWindow) /* 84 */
-#endif
-#ifndef XDrawPoint
-#define XDrawPoint \
-	(tkIntXlibStubsPtr->xDrawPoint) /* 85 */
-#endif
-#ifndef XDrawPoints
-#define XDrawPoints \
-	(tkIntXlibStubsPtr->xDrawPoints) /* 86 */
-#endif
-#ifndef XWarpPointer
-#define XWarpPointer \
-	(tkIntXlibStubsPtr->xWarpPointer) /* 87 */
-#endif
-#ifndef XQueryColor
-#define XQueryColor \
-	(tkIntXlibStubsPtr->xQueryColor) /* 88 */
-#endif
-#ifndef XQueryColors
-#define XQueryColors \
-	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
-#endif
-#ifndef XQueryTree
-#define XQueryTree \
-	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef XSetDashes
 #define XSetDashes \
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 2cb9ec1..d723218 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.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: tkMain.c,v 1.16 2003/09/05 22:44:39 dgp Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.17 2004/03/17 18:15:43 das Exp $
  */
 
 #include <ctype.h>
@@ -55,11 +55,7 @@ static Tcl_ThreadDataKey dataKey;
  */
 
 #if !defined(__WIN32__) && !defined(_WIN32)
-#if !defined(MAC_TCL)
 extern int		isatty _ANSI_ARGS_((int fd));
-#else
-#include <unistd.h>
-#endif
 extern char *		strrchr _ANSI_ARGS_((CONST char *string, int c));
 #endif
 
@@ -126,7 +122,7 @@ Tk_MainEx(argc, argv, appInitProc, interp)
     Tcl_FindExecutable(argv[0]);
     tsdPtr->interp = interp;
 
-#if (defined(__WIN32__) || defined(MAC_TCL))
+#if defined(__WIN32__)
     Tk_InitConsoleChannels(interp);
 #endif
     
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 8f92f44..ec5363a 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.8 2003/10/13 03:41:37 hobbs Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.9 2004/03/17 18:15:43 das Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -66,73 +66,6 @@ EXTERN int		Tk_TranslateWinEvent _ANSI_ARGS_((HWND hwnd,
 				LRESULT * result));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef Tk_MacSetEmbedHandler_TCL_DECLARED
-#define Tk_MacSetEmbedHandler_TCL_DECLARED
-/* 0 */
-EXTERN void		Tk_MacSetEmbedHandler _ANSI_ARGS_((
-				Tk_MacEmbedRegisterWinProc * registerWinProcPtr, 
-				Tk_MacEmbedGetGrafPortProc * getPortProcPtr, 
-				Tk_MacEmbedMakeContainerExistProc * containerExistProcPtr, 
-				Tk_MacEmbedGetClipProc * getClipProc, 
-				Tk_MacEmbedGetOffsetInParentProc * getOffsetProc));
-#endif
-#ifndef Tk_MacTurnOffMenus_TCL_DECLARED
-#define Tk_MacTurnOffMenus_TCL_DECLARED
-/* 1 */
-EXTERN void		Tk_MacTurnOffMenus _ANSI_ARGS_((void));
-#endif
-#ifndef Tk_MacTkOwnsCursor_TCL_DECLARED
-#define Tk_MacTkOwnsCursor_TCL_DECLARED
-/* 2 */
-EXTERN void		Tk_MacTkOwnsCursor _ANSI_ARGS_((int tkOwnsIt));
-#endif
-#ifndef TkMacInitMenus_TCL_DECLARED
-#define TkMacInitMenus_TCL_DECLARED
-/* 3 */
-EXTERN void		TkMacInitMenus _ANSI_ARGS_((Tcl_Interp * interp));
-#endif
-#ifndef TkMacInitAppleEvents_TCL_DECLARED
-#define TkMacInitAppleEvents_TCL_DECLARED
-/* 4 */
-EXTERN void		TkMacInitAppleEvents _ANSI_ARGS_((
-				Tcl_Interp * interp));
-#endif
-#ifndef TkMacConvertEvent_TCL_DECLARED
-#define TkMacConvertEvent_TCL_DECLARED
-/* 5 */
-EXTERN int		TkMacConvertEvent _ANSI_ARGS_((
-				EventRecord * eventPtr));
-#endif
-#ifndef TkMacConvertTkEvent_TCL_DECLARED
-#define TkMacConvertTkEvent_TCL_DECLARED
-/* 6 */
-EXTERN int		TkMacConvertTkEvent _ANSI_ARGS_((
-				EventRecord * eventPtr, Window window));
-#endif
-#ifndef TkGenWMConfigureEvent_TCL_DECLARED
-#define TkGenWMConfigureEvent_TCL_DECLARED
-/* 7 */
-EXTERN void		TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, 
-				int x, int y, int width, int height, 
-				int flags));
-#endif
-#ifndef TkMacInvalClipRgns_TCL_DECLARED
-#define TkMacInvalClipRgns_TCL_DECLARED
-/* 8 */
-EXTERN void		TkMacInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacHaveAppearance_TCL_DECLARED
-#define TkMacHaveAppearance_TCL_DECLARED
-/* 9 */
-EXTERN int		TkMacHaveAppearance _ANSI_ARGS_((void));
-#endif
-#ifndef TkMacGetDrawablePort_TCL_DECLARED
-#define TkMacGetDrawablePort_TCL_DECLARED
-/* 10 */
-EXTERN GWorldPtr	TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef Tk_MacOSXSetEmbedHandler_TCL_DECLARED
 #define Tk_MacOSXSetEmbedHandler_TCL_DECLARED
@@ -213,19 +146,6 @@ typedef struct TkPlatStubs {
     void (*tk_PointerEvent) _ANSI_ARGS_((HWND hwnd, int x, int y)); /* 4 */
     int (*tk_TranslateWinEvent) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT * result)); /* 5 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tk_MacSetEmbedHandler) _ANSI_ARGS_((Tk_MacEmbedRegisterWinProc * registerWinProcPtr, Tk_MacEmbedGetGrafPortProc * getPortProcPtr, Tk_MacEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacEmbedGetClipProc * getClipProc, Tk_MacEmbedGetOffsetInParentProc * getOffsetProc)); /* 0 */
-    void (*tk_MacTurnOffMenus) _ANSI_ARGS_((void)); /* 1 */
-    void (*tk_MacTkOwnsCursor) _ANSI_ARGS_((int tkOwnsIt)); /* 2 */
-    void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 3 */
-    void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 4 */
-    int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 5 */
-    int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 6 */
-    void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 7 */
-    void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 8 */
-    int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 9 */
-    GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 10 */
-#endif /* MAC_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 */
@@ -281,52 +201,6 @@ extern TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef Tk_MacSetEmbedHandler
-#define Tk_MacSetEmbedHandler \
-	(tkPlatStubsPtr->tk_MacSetEmbedHandler) /* 0 */
-#endif
-#ifndef Tk_MacTurnOffMenus
-#define Tk_MacTurnOffMenus \
-	(tkPlatStubsPtr->tk_MacTurnOffMenus) /* 1 */
-#endif
-#ifndef Tk_MacTkOwnsCursor
-#define Tk_MacTkOwnsCursor \
-	(tkPlatStubsPtr->tk_MacTkOwnsCursor) /* 2 */
-#endif
-#ifndef TkMacInitMenus
-#define TkMacInitMenus \
-	(tkPlatStubsPtr->tkMacInitMenus) /* 3 */
-#endif
-#ifndef TkMacInitAppleEvents
-#define TkMacInitAppleEvents \
-	(tkPlatStubsPtr->tkMacInitAppleEvents) /* 4 */
-#endif
-#ifndef TkMacConvertEvent
-#define TkMacConvertEvent \
-	(tkPlatStubsPtr->tkMacConvertEvent) /* 5 */
-#endif
-#ifndef TkMacConvertTkEvent
-#define TkMacConvertTkEvent \
-	(tkPlatStubsPtr->tkMacConvertTkEvent) /* 6 */
-#endif
-#ifndef TkGenWMConfigureEvent
-#define TkGenWMConfigureEvent \
-	(tkPlatStubsPtr->tkGenWMConfigureEvent) /* 7 */
-#endif
-#ifndef TkMacInvalClipRgns
-#define TkMacInvalClipRgns \
-	(tkPlatStubsPtr->tkMacInvalClipRgns) /* 8 */
-#endif
-#ifndef TkMacHaveAppearance
-#define TkMacHaveAppearance \
-	(tkPlatStubsPtr->tkMacHaveAppearance) /* 9 */
-#endif
-#ifndef TkMacGetDrawablePort
-#define TkMacGetDrawablePort \
-	(tkPlatStubsPtr->tkMacGetDrawablePort) /* 10 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef Tk_MacOSXSetEmbedHandler
 #define Tk_MacOSXSetEmbedHandler \
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index 2c686d6..917020f 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.8 2003/11/25 08:45:30 a_kovalenko Exp $
+ * RCS: @(#) $Id: tkPointer.c,v 1.9 2004/03/17 18:15:43 das Exp $
  */
 
 #include "tkInt.h"
@@ -20,11 +20,6 @@
 #include "tkWinInt.h"
 #endif
 
-#if defined(MAC_TCL)
-#include "tkMacInt.h"
-#define Cursor XCursor
-#endif
-
 #if defined(MAC_OSX_TK)
 #include "tkMacOSXInt.h"
 #define Cursor XCursor
diff --git a/generic/tkPort.h b/generic/tkPort.h
index a0ae88b..ae59dd9 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.4 2004/01/01 00:35:24 das Exp $
+ * RCS: @(#) $Id: tkPort.h,v 1.5 2004/03/17 18:15:44 das Exp $
  */
 
 #ifndef _TKPORT
@@ -26,9 +26,7 @@
 #if defined(__WIN32__) || defined(_WIN32)
 #   include "tkWinPort.h"
 #else
-#   if defined(MAC_TCL)
-#	include "tkMacPort.h"
-#   elif defined(MAC_OSX_TK)
+#   if defined(MAC_OSX_TK)
 #	include "tkMacOSXPort.h"
 #   else
 #	include "../unix/tkUnixPort.h"
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index c10c606..27c4935 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.14 2004/01/13 02:06:00 davygrvy Exp $
+ * RCS: @(#) $Id: tkSelect.c,v 1.15 2004/03/17 18:15:44 das Exp $
  */
 
 #include "tkInt.h"
@@ -1200,7 +1200,7 @@ TkSelInit(tkwin)
      *    http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11
      */
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || 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 2b0aeea..671f9d5 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.43 2003/10/13 03:41:37 hobbs Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.44 2004/03/17 18:15:44 das Exp $
  */
 
 #include "tkInt.h"
 #include "tkPort.h"
 
-#if !(defined(__WIN32__) && defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 /* UNIX */
 #define UNIX_TK
 #endif
@@ -22,14 +22,9 @@
 #ifdef __WIN32__
 #include "tkWinInt.h"
 #endif
-#if defined(MAC_TCL)
-/* set this locally .. we could have used _TKMACINT */
-#define MAC_TK
-#include "tkMacInt.h"
-#endif
 
 #if defined(MAC_OSX_TK)
-/* set this locally .. we could have used _TKMACINT */
+/* we could have used _TKMACINT */
 #include "tkMacOSXInt.h"
 #endif
 
@@ -172,125 +167,95 @@ TkIntStubs tkIntStubs = {
     TkpGetSubFonts, /* 110 */
     TkpGetSystemDefault, /* 111 */
     TkpMenuThreadInit, /* 112 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 113 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkClipBox, /* 113 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkClipBox, /* 113 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkClipBox, /* 113 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 114 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkCreateRegion, /* 114 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkCreateRegion, /* 114 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkCreateRegion, /* 114 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 115 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkDestroyRegion, /* 115 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkDestroyRegion, /* 115 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkDestroyRegion, /* 115 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 116 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkIntersectRegion, /* 116 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkIntersectRegion, /* 116 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkIntersectRegion, /* 116 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 117 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkRectInRegion, /* 117 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkRectInRegion, /* 117 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkRectInRegion, /* 117 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 118 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkSetRegion, /* 118 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkSetRegion, /* 118 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkSetRegion, /* 118 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 119 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkUnionRectWithRegion, /* 119 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkUnionRectWithRegion, /* 119 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkUnionRectWithRegion, /* 119 */
 #endif /* MAC_OSX_TK */
     NULL, /* 120 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 121 */
 #endif /* UNIX */
 #ifdef __WIN32__
     NULL, /* 121 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkpCreateNativeBitmap, /* 121 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkpCreateNativeBitmap, /* 121 */
 #endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 122 */
 #endif /* UNIX */
 #ifdef __WIN32__
     NULL, /* 122 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkpDefineNativeBitmaps, /* 122 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkpDefineNativeBitmaps, /* 122 */
 #endif /* MAC_OSX_TK */
     NULL, /* 123 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 124 */
 #endif /* UNIX */
 #ifdef __WIN32__
     NULL, /* 124 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkpGetNativeAppBitmap, /* 124 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkpGetNativeAppBitmap, /* 124 */
 #endif /* MAC_OSX_TK */
@@ -314,15 +279,12 @@ TkIntStubs tkIntStubs = {
     TkFocusFree, /* 142 */
     TkClipCleanup, /* 143 */
     TkGCCleanup, /* 144 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) /* UNIX */
     NULL, /* 145 */
 #endif /* UNIX */
 #ifdef __WIN32__
     TkSubtractRegion, /* 145 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkSubtractRegion, /* 145 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkSubtractRegion, /* 145 */
 #endif /* MAC_OSX_TK */
@@ -372,75 +334,6 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkWinGetPlatformId, /* 33 */
     TkWinSetHINSTANCE, /* 34 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkGenerateActivateEvents, /* 0 */
-    NULL, /* 1 */
-    NULL, /* 2 */
-    TkpGetMS, /* 3 */
-    NULL, /* 4 */
-    TkPointerDeadWindow, /* 5 */
-    TkpSetCapture, /* 6 */
-    TkpSetCursor, /* 7 */
-    TkpWmSetState, /* 8 */
-    NULL, /* 9 */
-    TkAboutDlg, /* 10 */
-    NULL, /* 11 */
-    NULL, /* 12 */
-    TkGetTransientMaster, /* 13 */
-    TkGenerateButtonEvent, /* 14 */
-    NULL, /* 15 */
-    TkGenWMDestroyEvent, /* 16 */
-    NULL, /* 17 */
-    TkMacButtonKeyState, /* 18 */
-    TkMacClearMenubarActive, /* 19 */
-    NULL, /* 20 */
-    TkMacDispatchMenuEvent, /* 21 */
-    TkMacInstallCursor, /* 22 */
-    NULL, /* 23 */
-    TkMacHandleTearoffMenu, /* 24 */
-    NULL, /* 25 */
-    NULL, /* 26 */
-    TkMacDoHLEvent, /* 27 */
-    NULL, /* 28 */
-    TkMacGenerateTime, /* 29 */
-    NULL, /* 30 */
-    TkMacGetScrollbarGrowWindow, /* 31 */
-    TkMacGetXWindow, /* 32 */
-    TkMacGrowToplevel, /* 33 */
-    TkMacHandleMenuSelect, /* 34 */
-    NULL, /* 35 */
-    NULL, /* 36 */
-    NULL, /* 37 */
-    TkMacInvalidateWindow, /* 38 */
-    TkMacIsCharacterMissing, /* 39 */
-    TkMacMakeRealWindowExist, /* 40 */
-    TkMacMakeStippleMap, /* 41 */
-    TkMacMenuClick, /* 42 */
-    TkMacRegisterOffScreenWindow, /* 43 */
-    TkMacResizable, /* 44 */
-    NULL, /* 45 */
-    TkMacSetHelpMenuItemCount, /* 46 */
-    TkMacSetScrollbarGrow, /* 47 */
-    TkMacSetUpClippingRgn, /* 48 */
-    TkMacSetUpGraphicsPort, /* 49 */
-    TkMacUpdateClipRgn, /* 50 */
-    TkMacUnregisterMacWindow, /* 51 */
-    TkMacUseMenuID, /* 52 */
-    TkMacVisableClipRgn, /* 53 */
-    TkMacWinBounds, /* 54 */
-    TkMacWindowOffset, /* 55 */
-    NULL, /* 56 */
-    TkSetMacColor, /* 57 */
-    TkSetWMName, /* 58 */
-    TkSuspendClipboard, /* 59 */
-    NULL, /* 60 */
-    TkMacZoomToplevel, /* 61 */
-    Tk_TopCoordsToWindow, /* 62 */
-    TkMacContainerId, /* 63 */
-    TkMacGetHostToplevel, /* 64 */
-    TkMacPreprocessMenu, /* 65 */
-    TkpIsWindowFloating, /* 66 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     TkGenerateActivateEvents, /* 0 */
     NULL, /* 1 */
@@ -497,7 +390,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     NULL, /* 52 */
     TkpGetMS, /* 53 */
 #endif /* MAC_OSX_TK */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
     TkFreeWindowId, /* 1 */
     TkInitXId, /* 2 */
@@ -626,99 +519,6 @@ TkIntXlibStubs tkIntXlibStubs = {
     XWarpPointer, /* 105 */
     XFillRectangle, /* 106 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    XSetDashes, /* 0 */
-    XGetModifierMapping, /* 1 */
-    XCreateImage, /* 2 */
-    XGetImage, /* 3 */
-    XGetAtomName, /* 4 */
-    XKeysymToString, /* 5 */
-    XCreateColormap, /* 6 */
-    XGContextFromGC, /* 7 */
-    XKeycodeToKeysym, /* 8 */
-    XStringToKeysym, /* 9 */
-    XRootWindow, /* 10 */
-    XSetErrorHandler, /* 11 */
-    XAllocColor, /* 12 */
-    XBell, /* 13 */
-    XChangeProperty, /* 14 */
-    XChangeWindowAttributes, /* 15 */
-    XConfigureWindow, /* 16 */
-    XCopyArea, /* 17 */
-    XCopyPlane, /* 18 */
-    XCreateBitmapFromData, /* 19 */
-    XDefineCursor, /* 20 */
-    XDestroyWindow, /* 21 */
-    XDrawArc, /* 22 */
-    XDrawLines, /* 23 */
-    XDrawRectangle, /* 24 */
-    XFillArc, /* 25 */
-    XFillPolygon, /* 26 */
-    XFillRectangles, /* 27 */
-    XFreeColormap, /* 28 */
-    XFreeColors, /* 29 */
-    XFreeModifiermap, /* 30 */
-    XGetGeometry, /* 31 */
-    XGetWindowProperty, /* 32 */
-    XGrabKeyboard, /* 33 */
-    XGrabPointer, /* 34 */
-    XKeysymToKeycode, /* 35 */
-    XMapWindow, /* 36 */
-    XMoveResizeWindow, /* 37 */
-    XMoveWindow, /* 38 */
-    XQueryPointer, /* 39 */
-    XRaiseWindow, /* 40 */
-    XRefreshKeyboardMapping, /* 41 */
-    XResizeWindow, /* 42 */
-    XSelectInput, /* 43 */
-    XSendEvent, /* 44 */
-    XSetIconName, /* 45 */
-    XSetInputFocus, /* 46 */
-    XSetSelectionOwner, /* 47 */
-    XSetWindowBackground, /* 48 */
-    XSetWindowBackgroundPixmap, /* 49 */
-    XSetWindowBorder, /* 50 */
-    XSetWindowBorderPixmap, /* 51 */
-    XSetWindowBorderWidth, /* 52 */
-    XSetWindowColormap, /* 53 */
-    XUngrabKeyboard, /* 54 */
-    XUngrabPointer, /* 55 */
-    XUnmapWindow, /* 56 */
-    TkPutImage, /* 57 */
-    XParseColor, /* 58 */
-    XCreateGC, /* 59 */
-    XFreeGC, /* 60 */
-    XInternAtom, /* 61 */
-    XSetBackground, /* 62 */
-    XSetForeground, /* 63 */
-    XSetClipMask, /* 64 */
-    XSetClipOrigin, /* 65 */
-    XSetTSOrigin, /* 66 */
-    XChangeGC, /* 67 */
-    XSetFont, /* 68 */
-    XSetArcMode, /* 69 */
-    XSetStipple, /* 70 */
-    XSetFillRule, /* 71 */
-    XSetFillStyle, /* 72 */
-    XSetFunction, /* 73 */
-    XSetLineAttributes, /* 74 */
-    _XInitImageFuncPtrs, /* 75 */
-    XCreateIC, /* 76 */
-    XGetVisualInfo, /* 77 */
-    XSetWMClientMachine, /* 78 */
-    XStringListToTextProperty, /* 79 */
-    XDrawSegments, /* 80 */
-    XForceScreenSaver, /* 81 */
-    XDrawLine, /* 82 */
-    XFillRectangle, /* 83 */
-    XClearWindow, /* 84 */
-    XDrawPoint, /* 85 */
-    XDrawPoints, /* 86 */
-    XWarpPointer, /* 87 */
-    XQueryColor, /* 88 */
-    XQueryColors, /* 89 */
-    XQueryTree, /* 90 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
@@ -825,19 +625,6 @@ TkPlatStubs tkPlatStubs = {
     Tk_PointerEvent, /* 4 */
     Tk_TranslateWinEvent, /* 5 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    Tk_MacSetEmbedHandler, /* 0 */
-    Tk_MacTurnOffMenus, /* 1 */
-    Tk_MacTkOwnsCursor, /* 2 */
-    TkMacInitMenus, /* 3 */
-    TkMacInitAppleEvents, /* 4 */
-    TkMacConvertEvent, /* 5 */
-    TkMacConvertTkEvent, /* 6 */
-    TkGenWMConfigureEvent, /* 7 */
-    TkMacInvalClipRgns, /* 8 */
-    TkMacHaveAppearance, /* 9 */
-    TkMacGetDrawablePort, /* 10 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     Tk_MacOSXSetEmbedHandler, /* 0 */
     Tk_MacOSXTurnOffMenus, /* 1 */
@@ -1137,5 +924,4 @@ TkStubs tkStubs = {
 /* !END!: Do not edit above this line. */
 
 #undef UNIX_TK
-#undef MAC_TK
 #undef MAC_OSX_TK
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index c86c2c5..0fa5d11 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.8 2002/08/31 06:12:27 das Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.9 2004/03/17 18:15:44 das Exp $
  */
 
 
@@ -38,10 +38,6 @@
 #include "tkWinInt.h"
 #endif
 
-#ifdef MAC_TCL
-#include "tkMacInt.h"
-#endif
-
 #ifdef MAC_OSX_TK
 #include "tkMacOSXInt.h"
 #endif
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 0dbbc2b..f3f5931 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.22 2003/05/19 13:04:23 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTest.c,v 1.23 2004/03/17 18:15:44 das Exp $
  */
 
 #include "tkInt.h"
@@ -24,7 +24,7 @@
 #include "tkWinInt.h"
 #endif
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
 #include "tkScrollbar.h"
 #endif
 
@@ -181,7 +181,7 @@ static int		TestmakeexistCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
 static int		TestmenubarCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(__WIN32__) || defined(MAC_OSX_TK)
 static int		TestmetricsCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
 #endif
@@ -205,7 +205,7 @@ static int		TestsendCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
 static int		TesttextCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 static int		TestwrapperCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
 #endif
@@ -223,7 +223,7 @@ static void		TrivialEventProc _ANSI_ARGS_((ClientData clientData,
 
 extern int		TkplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp));
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 #define TkplatformtestInit(x) TCL_OK
 #endif
 
@@ -281,23 +281,23 @@ Tktest_Init(interp)
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
     Tcl_CreateCommand(interp, "testmakeexist", TestmakeexistCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
-#if !(defined(__WIN32__) || defined(MAC_TCL))
+#if !(defined(__WIN32__))
     Tcl_CreateCommand(interp, "testmenubar", TestmenubarCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
 #endif
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(__WIN32__) || defined(MAC_OSX_TK)
     Tcl_CreateCommand(interp, "testmetrics", TestmetricsCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
 #endif
     Tcl_CreateCommand(interp, "testprop", TestpropCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
-#if !(defined(__WIN32__) || defined(MAC_TCL))
+#if !(defined(__WIN32__))
     Tcl_CreateCommand(interp, "testsend", TestsendCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
 #endif
     Tcl_CreateCommand(interp, "testtext", TesttextCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
     Tcl_CreateCommand(interp, "testwrapper", TestwrapperCmd,
 	    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
 #endif
@@ -2056,7 +2056,7 @@ TestmetricsCmd(clientData, interp, argc, argv)
     return TCL_OK;
 }
 #endif
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
 static int
 TestmetricsCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Main window for application. */
@@ -2190,7 +2190,7 @@ TestpropCmd(clientData, interp, argc, argv)
  */
 
 	/* ARGSUSED */
-#if !(defined(__WIN32__) || defined(MAC_TCL))
+#if !(defined(__WIN32__))
 static int
 TestsendCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Main window for application. */
@@ -2369,7 +2369,7 @@ TesttextCmd(clientData, interp, argc, argv)
     return TCL_OK;
 }
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 /*
  *----------------------------------------------------------------------
  *
diff --git a/generic/tkText.c b/generic/tkText.c
index 9981e1d..bd417d0 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -14,7 +14,7 @@
  * 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.48 2004/01/13 02:06:00 davygrvy Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.49 2004/03/17 18:15:44 das Exp $
  */
 
 #include "default.h"
@@ -22,7 +22,7 @@
 #include "tkInt.h"
 #include "tkUndo.h"
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
 #define Style TkStyle
 #define DInfo TkDInfo
 #endif
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 05b591d..769e4fd 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.62 2004/01/13 02:06:01 davygrvy Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.63 2004/03/17 18:15:44 das Exp $
  */
 
 #include "tkPort.h"
 #include "tkInt.h"
 
-#if !( defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !( defined(__WIN32__) || defined(MAC_OSX_TK))
 #include "tkUnixInt.h"
 #endif
 
@@ -136,7 +136,7 @@ static TkCmd commands[] = {
     {"selection",	NULL,			Tk_SelectionObjCmd,	0, 1},
     {"tk",		NULL,			Tk_TkObjCmd,		1, 1},
     {"tkwait",		NULL,			Tk_TkwaitObjCmd,	1, 1},
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(__WIN32__) || 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},
@@ -175,7 +175,7 @@ static TkCmd commands[] = {
      * Misc.
      */
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
     {"::tk::unsupported::MacWindowStyle",
 	    		TkUnsupported1Cmd,	NULL,			1, 1},
 #endif
@@ -1442,7 +1442,7 @@ Tk_DestroyWindow(tkwin)
 	TkWmRemoveFromColormapWindows(winPtr);
     }
     if (winPtr->window != None) {
-#if defined(MAC_TCL) || defined(MAC_OSX_TK) || defined(__WIN32__)
+#if defined(MAC_OSX_TK) || defined(__WIN32__)
 	XDestroyWindow(winPtr->display, winPtr->window);
 #else
 	if ((winPtr->flags & TK_TOP_HIERARCHY)
@@ -1551,7 +1551,7 @@ Tk_DestroyWindow(tkwin)
              * display now and relinquish its data structures.
              */
 
-#if !defined(WIN32) && !defined(MAC_TCL) && defined(NOT_YET)
+#if !defined(WIN32) && defined(NOT_YET)
             if (dispPtr->refCount <= 0) {
                 /*
                  * I have disabled this code because on Windows there are
@@ -2086,7 +2086,7 @@ Tk_DefineCursor(tkwin, cursor)
 {
     register TkWindow *winPtr = (TkWindow *) tkwin;
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
     winPtr->atts.cursor = (XCursor) cursor;
 #else
     winPtr->atts.cursor = (Cursor) cursor;