More complete purge of things only present for supporting long-dead Mac 9 systems.

19 files changed, 33 insertions, 85 deletions

diff --git a/generic/default.h b/generic/default.h
index dd4f609..6156f4d 100755
--- a/generic/default.h
+++ b/generic/default.h
@@ -20,8 +20,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.h b/generic/tk.h
index e777947..4a5b371 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -60,9 +60,8 @@ extern "C" {
 
 /* 
  * A special definition used to allow this header file to be included
- * from windows or mac resource files so that they can obtain version
- * information.  RC_INVOKED is defined by default by the windows RC tool
- * and manually set for macintosh.
+ * from windows resource files so that they can obtain version
+ * information.  RC_INVOKED is defined by default by the windows RC tool.
  *
  * Resource compilers don't like all the C stuff, like typedefs and
  * procedure declarations, that occur below, so block them out.
@@ -71,10 +70,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 3003f18..3d617d4 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -19,7 +19,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 16cfd8d..1e830e2 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -17,8 +17,6 @@
 
 #if defined(WIN32)
 #include "tkWinInt.h"
-#elif defined(MAC_TCL)
-#include "tkMacInt.h"
 #elif defined(MAC_OSX_TK) 
 #include "tkMacOSXInt.h"
 #else
@@ -837,8 +835,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 af6e76a..7d9da77 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -350,11 +350,7 @@ Tk_CreateConsoleWindow(interp)
     int result = TCL_OK;
     int haveConsoleChannel = 1;
 
-#ifdef MAC_TCL
-    static CONST char *initCmd = "if {[catch {source $tk_library:console.tcl}]} {source -rsrc console}";
-#else
     static CONST char *initCmd = "source $tk_library/console.tcl";
-#endif
 
     /* Init an interp with Tcl and Tk */
     Tcl_Interp *consoleInterp = Tcl_CreateInterp();
diff --git a/generic/tkFileFilter.h b/generic/tkFileFilter.h
index 8d7021e..6df986f 100644
--- a/generic/tkFileFilter.h
+++ b/generic/tkFileFilter.h
@@ -13,11 +13,7 @@
 #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 3f4748c..4fa7393 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -13,7 +13,7 @@
 #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/tkImgPhoto.c b/generic/tkImgPhoto.c
index 23db11a..7c87c42 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -2770,15 +2770,7 @@ ImgPhotoDisplay(clientData, display, drawable, imageX, imageY, width,
 	return;
     }
 
-    if (
-#if defined(MAC_TCL)
-	/*
-	 * The retrieval of bgImg is currently not functional on OS9
-	 * so skip attempts to alpha blend.
-	 */
-	0 &&
-#endif
-	(instancePtr->masterPtr->flags & COMPLEX_ALPHA)
+    if ((instancePtr->masterPtr->flags & COMPLEX_ALPHA)
 	    && visInfo.depth >= 15
 	    && (visInfo.class == DirectColor || visInfo.class == TrueColor)) {
 	Tk_ErrorHandler handler;
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index b808233..fc12521 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -19,11 +19,7 @@
  * in the generic/tkInt.decls script.
  */
 
-#ifdef MAC_TCL
-#include "Xutil.h"
-#else
 #include "X11/Xutil.h"
-#endif
 
 #ifdef BUILD_tk
 #undef TCL_STORAGE_CLASS
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 365e0d1..5e5ddb7 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -96,11 +96,7 @@ static int WinIsTty(int fd) {
     }
 }
 #else
-#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
 
@@ -193,7 +189,7 @@ Tk_MainEx(argc, argv, appInitProc, interp)
 	/* Only initialize console when not running under cygwin */
 	Tk_InitConsoleChannels(interp);
     }
-#elif  defined(__WIN32__) || defined(MAC_TCL)
+#elif  defined(__WIN32__)
     Tk_InitConsoleChannels(interp);
 #endif
 
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 4bcc46f..a8fd7ce 100755
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -32,9 +32,7 @@
  * cascades labelled "File" and "Edit", the cascade menus might have
  * the pathnames .m.file and .m.edit. Another constraint is that the menus
  * used for menubars must be children of the toplevel widget that they
- * are attached to. And on the Macintosh, the platform specific menu handle
- * for cascades attached to a menu bar must have a title that matches the
- * label for the cascade menu.
+ * are attached to. 
  *
  * To handle all of the constraints, Tk menubars and tearoff menus are
  * implemented using menu clones. Menu clones are full menus in their own
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index 949dcee..7b2408f 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -18,11 +18,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 ca592d1..00c49fd 100644
--- a/generic/tkPort.h
+++ b/generic/tkPort.h
@@ -24,9 +24,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 "tkUnixPort.h"
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index 2ac3424..1b65c42 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -1198,7 +1198,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 77f5379..dc22008 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -12,7 +12,7 @@
 #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
@@ -20,11 +20,6 @@
 #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 */
@@ -241,7 +236,7 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c)
 
 #	define TkBindDeadWindow 0 /* On purpose not in Cygwin's stub table */
 
-#   elif !defined(MAC_TCL) && !defined(MAC_OSX_TK) /* UNIX */
+#   elif !defined(MAC_OSX_TK) /* UNIX */
 
 #	undef TkClipBox
 #	undef TkCreateRegion
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index 29c4851..6f19aa8 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -36,10 +36,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 6cb776c..78496e6 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -22,7 +22,7 @@
 #include "tkWinInt.h"
 #endif
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
 #include "tkScrollbar.h"
 #endif
 
@@ -177,11 +177,11 @@ static int		TestfontObjCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Obj *CONST objv[]));
 static int		TestmakeexistCmd _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		TestmenubarCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
 #endif
-#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
@@ -201,13 +201,13 @@ static void	CustomOptionFree _ANSI_ARGS_((ClientData clientData,
 			Tk_Window tkwin, char *internalPtr));
 static int		TestpropCmd _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		TestsendCmd _ANSI_ARGS_((ClientData dummy,
 			    Tcl_Interp *interp, int argc, CONST char **argv));
 #endif
 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
@@ -225,7 +225,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
 
@@ -283,23 +283,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) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
     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) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
     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
@@ -1961,7 +1961,7 @@ TestmakeexistCmd(clientData, interp, argc, argv)
  */
 
 	/* ARGSUSED */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 static int
 TestmenubarCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Main window for application. */
@@ -2030,7 +2030,7 @@ TestmenubarCmd(clientData, interp, argc, argv)
  *----------------------------------------------------------------------
  */
 
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(__WIN32__) || defined(MAC_OSX_TK)
 static int
 TestmetricsCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Main window for application. */
@@ -2182,7 +2182,7 @@ TestpropCmd(clientData, interp, argc, argv)
  */
 
 	/* ARGSUSED */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 static int
 TestsendCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Main window for application. */
@@ -2357,7 +2357,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 54f148d..fb15468 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -20,7 +20,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 c442ef4..2bccbb9 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -18,7 +18,7 @@
 
 #ifdef __WIN32__
 #include "tkWinInt.h"
-#elif !(defined(MAC_TCL) ||  defined(MAC_OSX_TK))
+#elif !(defined(MAC_OSX_TK))
 #include "tkUnixInt.h"
 #endif
 
@@ -136,7 +136,7 @@ static CONST TkCmd commands[] = {
     {"selection",	Tk_SelectionObjCmd,	PASSMAINWINDOW},
     {"tk",		Tk_TkObjCmd,		PASSMAINWINDOW|ISSAFE},
     {"tkwait",		Tk_TkwaitObjCmd,	PASSMAINWINDOW|ISSAFE},
-#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(__WIN32__) || defined(MAC_OSX_TK)
     {"tk_chooseColor",  Tk_ChooseColorObjCmd,	PASSMAINWINDOW},
     {"tk_chooseDirectory", Tk_ChooseDirectoryObjCmd, WINMACONLY|PASSMAINWINDOW},
     {"tk_getOpenFile",  Tk_GetOpenFileObjCmd,	WINMACONLY|PASSMAINWINDOW},
@@ -175,7 +175,7 @@ static CONST TkCmd commands[] = {
      * Misc.
      */
 
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+#if defined(MAC_OSX_TK)
     {"::tk::unsupported::MacWindowStyle",
 	    		TkUnsupported1ObjCmd,			PASSMAINWINDOW|ISSAFE},
 #endif
@@ -1461,7 +1461,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)
@@ -1571,7 +1571,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
@@ -2113,7 +2113,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;