** upport to 8.4 of mac code changes for 8.3.3 & various new

	**  changes for 8.4, some already backported to 8.3.4 (patch #435660)

	see ChangeLog for details

10 files changed, 178 insertions, 450 deletions

diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index bb6bcad..e09eefe 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.13 2001/08/06 18:29:41 dgp Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.14 2001/11/23 02:04:44 das Exp $
  */
 
 #include "tk.h"
@@ -336,7 +336,7 @@ Tk_CreateConsoleWindow(interp)
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 #ifdef MAC_TCL
-    static char initCmd[] = "source -rsrc {Console}";
+    static char initCmd[] = "if {[catch {source $tk_library:console.tcl}]} {source -rsrc console}";
 #else
     static char initCmd[] = "source $tk_library/console.tcl";
 #endif
@@ -476,6 +476,9 @@ ConsoleClose(instanceData, interp)
     ClientData instanceData;	/* Unused. */
     Tcl_Interp *interp;		/* Unused. */
 {
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    tsdPtr->gStdoutInterp = NULL;
     return 0;
 }
 
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 05f5a00..b9f841a 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -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: tkGrid.c,v 1.17 2001/09/30 19:01:58 pspjuth Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.18 2001/11/23 02:04:48 das Exp $
  */
 
 #include "tkInt.h"
@@ -2554,7 +2554,7 @@ ConfigureSlaves(interp, tkwin, objc, objv)
     firstChar = 0;
     for (numWindows = i = 0; i < objc; i++) {
 	prevChar = firstChar;
-	string = Tcl_GetStringFromObj(objv[i], &length);
+	string = Tcl_GetStringFromObj(objv[i], (int *) &length);
     	firstChar = string[0];
 	
 	if (firstChar == '.') {
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 71d5690..13383a9 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tkInt.decls,v 1.21 2001/09/25 16:25:20 dgp Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.22 2001/11/23 02:04:56 das Exp $
 
 library tk
 
@@ -556,9 +556,10 @@ declare 119 {mac win} {
 	    TkRegion src, TkRegion dr_return)
 }
 
-declare 120 mac {
-    void TkGenerateActivateEvents (TkWindow *winPtr, int active)
-}
+# removed duplicate from tkIntPlat table
+#declare 120 mac {
+#    void TkGenerateActivateEvents (TkWindow *winPtr, int active)
+#}
 
 declare 121 mac {
     Pixmap TkpCreateNativeBitmap (Display *display, char * source)
@@ -568,48 +569,50 @@ declare 122 mac {
     void TkpDefineNativeBitmaps (void)
 }
 
-declare 123 mac {
-    unsigned long TkpGetMS (void)
-}
+# removed duplicate from tkIntPlat table
+#declare 123 mac {
+#    unsigned long TkpGetMS (void)
+#}
 
 declare 124 mac {
     Pixmap TkpGetNativeAppBitmap (Display *display, \
  	    CONST char *name, int *width, int *height)
 }
 
-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)
-}
+# 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, \
@@ -833,13 +836,14 @@ declare 0 mac {
     void TkGenerateActivateEvents (TkWindow *winPtr, int active)
 }
 
-declare 1 mac {
-    Pixmap TkpCreateNativeBitmap (Display *display, char * source)
-}
-
-declare 2 mac {
-    void TkpDefineNativeBitmaps (void)
-}
+# removed duplicates from tkInt table
+#declare 1 mac {
+#    Pixmap TkpCreateNativeBitmap (Display *display, char * source)
+#}
+#
+#declare 2 mac {
+#    void TkpDefineNativeBitmaps (void)
+#}
 
 declare 3 mac {
     unsigned long TkpGetMS (void)
@@ -878,10 +882,11 @@ declare 16 mac {
     void  TkGenWMDestroyEvent (Tk_Window tkwin)
 }
 
-declare 17 mac {
-    void  TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \
-	    int width, int height, int flags)
-}
+# 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)
@@ -891,9 +896,10 @@ declare 19 mac {
     void  TkMacClearMenubarActive (void)
 }
 
-declare 20 mac {
-    int  TkMacConvertEvent (EventRecord *eventPtr)
-}
+# removed duplicate from tkPlat table (tk.decls)
+#declare 20 mac {
+#    int  TkMacConvertEvent (EventRecord *eventPtr)
+#}
 
 declare 21 mac {
     int  TkMacDispatchMenuEvent (int menuID, int index)
@@ -903,17 +909,19 @@ declare 22 mac {
     void  TkMacInstallCursor (int resizeOverride)
 }
 
-declare 23 mac {
-    int  TkMacConvertTkEvent (EventRecord *eventPtr, Window window)
-}
+# removed duplicate from tkPlat table (tk.decls)
+#declare 23 mac {
+#    int  TkMacConvertTkEvent (EventRecord *eventPtr, Window window)
+#}
 
 declare 24 mac {
     void  TkMacHandleTearoffMenu (void)
 }
 
-declare 26 mac {
-    void  TkMacInvalClipRgns (TkWindow *winPtr)
-}
+# removed duplicate from tkPlat table (tk.decls)
+#declare 26 mac {
+#    void  TkMacInvalClipRgns (TkWindow *winPtr)
+#}
 
 declare 27 mac {
     void  TkMacDoHLEvent (EventRecord *theEvent)
@@ -923,9 +931,10 @@ declare 29 mac {
     Time  TkMacGenerateTime (void)
 }
 
-declare 30 mac {
-    GWorldPtr  TkMacGetDrawablePort (Drawable drawable)
-}
+# removed duplicate from tkPlat table (tk.decls)
+#declare 30 mac {
+#    GWorldPtr  TkMacGetDrawablePort (Drawable drawable)
+#}
 
 declare 31 mac {
     TkWindow *  TkMacGetScrollbarGrowWindow (TkWindow *winPtr)
@@ -943,17 +952,18 @@ declare 34 mac {
     void   TkMacHandleMenuSelect (long mResult, int optionKeyPressed)
 }
 
-declare 35 mac {
-    int  TkMacHaveAppearance (void)
-}
-
-declare 36 mac {
-    void  TkMacInitAppleEvents (Tcl_Interp *interp)
-}
-
-declare 37 mac {
-    void   TkMacInitMenus (Tcl_Interp  *interp)
-}
+# 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)
@@ -1056,6 +1066,9 @@ declare 65 mac {
     void TkMacPreprocessMenu (void)
 }
 
+declare 66 mac {
+    int TkpIsWindowFloating (WindowRef window)
+}
 
 ##############################################################################
 
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 9477f4e..11875d8 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkIntDecls.h,v 1.13 2001/09/21 21:19:43 hobbs Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.14 2001/11/23 02:05:04 das Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -435,11 +435,7 @@ EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect,
 EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
 				TkRegion src, TkRegion dr_return));
 #endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 120 */
-EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
-				TkWindow * winPtr, int active));
-#endif /* MAC_TCL */
+/* Slot 120 is reserved */
 #ifdef MAC_TCL
 /* 121 */
 EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, 
@@ -449,53 +445,22 @@ EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display * display,
 /* 122 */
 EXTERN void		TkpDefineNativeBitmaps _ANSI_ARGS_((void));
 #endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 123 */
-EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
-#endif /* MAC_TCL */
+/* Slot 123 is reserved */
 #ifdef MAC_TCL
 /* 124 */
 EXTERN Pixmap		TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, 
 				CONST char * name, int * width, int * height));
 #endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 125 */
-EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 126 */
-EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 127 */
-EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 128 */
-EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
-				int state));
-#endif /* MAC_TCL */
+/* Slot 125 is reserved */
+/* Slot 126 is reserved */
+/* Slot 127 is reserved */
+/* Slot 128 is reserved */
 /* Slot 129 is reserved */
-#ifdef MAC_TCL
-/* 130 */
-EXTERN Window		TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr));
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 131 */
-EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, 
-				Window window, unsigned int state));
-#endif /* MAC_TCL */
+/* Slot 130 is reserved */
+/* Slot 131 is reserved */
 /* Slot 132 is reserved */
-#ifdef MAC_TCL
-/* 133 */
-EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-/* 134 */
-EXTERN void		TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, 
-				int x, int y, int width, int height, 
-				int flags));
-#endif /* MAC_TCL */
+/* Slot 133 is reserved */
+/* Slot 134 is reserved */
 /* 135 */
 EXTERN void		TkpDrawHighlightBorder _ANSI_ARGS_((Tk_Window tkwin, 
 				GC fgGC, GC bgGC, int highlightWidth, 
@@ -695,15 +660,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     void *reserved120;
-#endif /* UNIX */
-#ifdef __WIN32__
-    void *reserved120;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 120 */
-#endif /* MAC_TCL */
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     void *reserved121;
 #endif /* UNIX */
@@ -722,15 +679,7 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */
 #endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void *reserved123;
-#endif /* UNIX */
-#ifdef __WIN32__
     void *reserved123;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 123 */
-#endif /* MAC_TCL */
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     void *reserved124;
 #endif /* UNIX */
@@ -740,80 +689,16 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */
 #endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void *reserved125;
-#endif /* UNIX */
-#ifdef __WIN32__
     void *reserved125;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 125 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void *reserved126;
-#endif /* UNIX */
-#ifdef __WIN32__
     void *reserved126;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 126 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     void *reserved127;
-#endif /* UNIX */
-#ifdef __WIN32__
-    void *reserved127;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 127 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     void *reserved128;
-#endif /* UNIX */
-#ifdef __WIN32__
-    void *reserved128;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 128 */
-#endif /* MAC_TCL */
     void *reserved129;
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void *reserved130;
-#endif /* UNIX */
-#ifdef __WIN32__
     void *reserved130;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 130 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     void *reserved131;
-#endif /* UNIX */
-#ifdef __WIN32__
-    void *reserved131;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 131 */
-#endif /* MAC_TCL */
     void *reserved132;
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void *reserved133;
-#endif /* UNIX */
-#ifdef __WIN32__
     void *reserved133;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 133 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void *reserved134;
-#endif /* UNIX */
-#ifdef __WIN32__
     void *reserved134;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 134 */
-#endif /* MAC_TCL */
     void (*tkpDrawHighlightBorder) _ANSI_ARGS_((Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable)); /* 135 */
     void (*tkSetFocusWin) _ANSI_ARGS_((TkWindow * winPtr, int force)); /* 136 */
     void (*tkpSetKeycodeAndState) _ANSI_ARGS_((Tk_Window tkwin, KeySym keySym, XEvent * eventPtr)); /* 137 */
@@ -1369,12 +1254,7 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkGenerateActivateEvents
-#define TkGenerateActivateEvents \
-	(tkIntStubsPtr->tkGenerateActivateEvents) /* 120 */
-#endif
-#endif /* MAC_TCL */
+/* Slot 120 is reserved */
 #ifdef MAC_TCL
 #ifndef TkpCreateNativeBitmap
 #define TkpCreateNativeBitmap \
@@ -1387,68 +1267,23 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkpGetMS
-#define TkpGetMS \
-	(tkIntStubsPtr->tkpGetMS) /* 123 */
-#endif
-#endif /* MAC_TCL */
+/* Slot 123 is reserved */
 #ifdef MAC_TCL
 #ifndef TkpGetNativeAppBitmap
 #define TkpGetNativeAppBitmap \
 	(tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */
 #endif
 #endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkPointerDeadWindow
-#define TkPointerDeadWindow \
-	(tkIntStubsPtr->tkPointerDeadWindow) /* 125 */
-#endif
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkpSetCapture
-#define TkpSetCapture \
-	(tkIntStubsPtr->tkpSetCapture) /* 126 */
-#endif
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkpSetCursor
-#define TkpSetCursor \
-	(tkIntStubsPtr->tkpSetCursor) /* 127 */
-#endif
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkpWmSetState
-#define TkpWmSetState \
-	(tkIntStubsPtr->tkpWmSetState) /* 128 */
-#endif
-#endif /* MAC_TCL */
+/* Slot 125 is reserved */
+/* Slot 126 is reserved */
+/* Slot 127 is reserved */
+/* Slot 128 is reserved */
 /* Slot 129 is reserved */
-#ifdef MAC_TCL
-#ifndef TkGetTransientMaster
-#define TkGetTransientMaster \
-	(tkIntStubsPtr->tkGetTransientMaster) /* 130 */
-#endif
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkGenerateButtonEvent
-#define TkGenerateButtonEvent \
-	(tkIntStubsPtr->tkGenerateButtonEvent) /* 131 */
-#endif
-#endif /* MAC_TCL */
+/* Slot 130 is reserved */
+/* Slot 131 is reserved */
 /* Slot 132 is reserved */
-#ifdef MAC_TCL
-#ifndef TkGenWMDestroyEvent
-#define TkGenWMDestroyEvent \
-	(tkIntStubsPtr->tkGenWMDestroyEvent) /* 133 */
-#endif
-#endif /* MAC_TCL */
-#ifdef MAC_TCL
-#ifndef TkGenWMConfigureEvent
-#define TkGenWMConfigureEvent \
-	(tkIntStubsPtr->tkGenWMConfigureEvent) /* 134 */
-#endif
-#endif /* MAC_TCL */
+/* Slot 133 is reserved */
+/* Slot 134 is reserved */
 #ifndef TkpDrawHighlightBorder
 #define TkpDrawHighlightBorder \
 	(tkIntStubsPtr->tkpDrawHighlightBorder) /* 135 */
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 234dcd5..fffa782 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.9 2001/09/25 16:25:20 dgp Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.10 2001/11/23 02:05:16 das Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -150,11 +150,8 @@ EXTERN int		TkWinGetPlatformId _ANSI_ARGS_((void));
 /* 0 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
 				TkWindow * winPtr, int active));
-/* 1 */
-EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, 
-				char * source));
-/* 2 */
-EXTERN void		TkpDefineNativeBitmaps _ANSI_ARGS_((void));
+/* Slot 1 is reserved */
+/* Slot 2 is reserved */
 /* 3 */
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
 /* Slot 4 is reserved */
@@ -180,37 +177,28 @@ EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y,
 /* Slot 15 is reserved */
 /* 16 */
 EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-/* 17 */
-EXTERN void		TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, 
-				int x, int y, int width, int height, 
-				int flags));
+/* Slot 17 is reserved */
 /* 18 */
 EXTERN unsigned int	TkMacButtonKeyState _ANSI_ARGS_((void));
 /* 19 */
 EXTERN void		TkMacClearMenubarActive _ANSI_ARGS_((void));
-/* 20 */
-EXTERN int		TkMacConvertEvent _ANSI_ARGS_((
-				EventRecord * eventPtr));
+/* Slot 20 is reserved */
 /* 21 */
 EXTERN int		TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, 
 				int index));
 /* 22 */
 EXTERN void		TkMacInstallCursor _ANSI_ARGS_((int resizeOverride));
-/* 23 */
-EXTERN int		TkMacConvertTkEvent _ANSI_ARGS_((
-				EventRecord * eventPtr, Window window));
+/* Slot 23 is reserved */
 /* 24 */
 EXTERN void		TkMacHandleTearoffMenu _ANSI_ARGS_((void));
 /* Slot 25 is reserved */
-/* 26 */
-EXTERN void		TkMacInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr));
+/* Slot 26 is reserved */
 /* 27 */
 EXTERN void		TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent));
 /* Slot 28 is reserved */
 /* 29 */
 EXTERN Time		TkMacGenerateTime _ANSI_ARGS_((void));
-/* 30 */
-EXTERN GWorldPtr	TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
+/* Slot 30 is reserved */
 /* 31 */
 EXTERN TkWindow *	TkMacGetScrollbarGrowWindow _ANSI_ARGS_((
 				TkWindow * winPtr));
@@ -222,13 +210,9 @@ EXTERN int		TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow,
 /* 34 */
 EXTERN void		TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, 
 				int optionKeyPressed));
-/* 35 */
-EXTERN int		TkMacHaveAppearance _ANSI_ARGS_((void));
-/* 36 */
-EXTERN void		TkMacInitAppleEvents _ANSI_ARGS_((
-				Tcl_Interp * interp));
-/* 37 */
-EXTERN void		TkMacInitMenus _ANSI_ARGS_((Tcl_Interp * interp));
+/* Slot 35 is reserved */
+/* Slot 36 is reserved */
+/* Slot 37 is reserved */
 /* 38 */
 EXTERN void		TkMacInvalidateWindow _ANSI_ARGS_((
 				MacDrawable * macWin, int flag));
@@ -295,6 +279,8 @@ EXTERN MacDrawable *	TkMacContainerId _ANSI_ARGS_((TkWindow * winPtr));
 EXTERN MacDrawable *	TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr));
 /* 65 */
 EXTERN void		TkMacPreprocessMenu _ANSI_ARGS_((void));
+/* 66 */
+EXTERN int		TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
 #endif /* MAC_TCL */
 
 typedef struct TkIntPlatStubs {
@@ -350,8 +336,8 @@ typedef struct TkIntPlatStubs {
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
-    Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 1 */
-    void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 2 */
+    void *reserved1;
+    void *reserved2;
     unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */
     void *reserved4;
     void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */
@@ -366,27 +352,27 @@ typedef struct TkIntPlatStubs {
     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 (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 17 */
+    void *reserved17;
     unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 18 */
     void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 19 */
-    int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 20 */
+    void *reserved20;
     int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 21 */
     void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 22 */
-    int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 23 */
+    void *reserved23;
     void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 24 */
     void *reserved25;
-    void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 26 */
+    void *reserved26;
     void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 27 */
     void *reserved28;
     Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */
-    GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 30 */
+    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 */
-    int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 35 */
-    void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 36 */
-    void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 37 */
+    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 */
@@ -415,6 +401,7 @@ typedef struct TkIntPlatStubs {
     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 */
 } TkIntPlatStubs;
 
@@ -610,14 +597,8 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
 #endif
-#ifndef TkpCreateNativeBitmap
-#define TkpCreateNativeBitmap \
-	(tkIntPlatStubsPtr->tkpCreateNativeBitmap) /* 1 */
-#endif
-#ifndef TkpDefineNativeBitmaps
-#define TkpDefineNativeBitmaps \
-	(tkIntPlatStubsPtr->tkpDefineNativeBitmaps) /* 2 */
-#endif
+/* Slot 1 is reserved */
+/* Slot 2 is reserved */
 #ifndef TkpGetMS
 #define TkpGetMS \
 	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
@@ -659,10 +640,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkGenWMDestroyEvent \
 	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 16 */
 #endif
-#ifndef TkGenWMConfigureEvent
-#define TkGenWMConfigureEvent \
-	(tkIntPlatStubsPtr->tkGenWMConfigureEvent) /* 17 */
-#endif
+/* Slot 17 is reserved */
 #ifndef TkMacButtonKeyState
 #define TkMacButtonKeyState \
 	(tkIntPlatStubsPtr->tkMacButtonKeyState) /* 18 */
@@ -671,10 +649,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkMacClearMenubarActive \
 	(tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 19 */
 #endif
-#ifndef TkMacConvertEvent
-#define TkMacConvertEvent \
-	(tkIntPlatStubsPtr->tkMacConvertEvent) /* 20 */
-#endif
+/* Slot 20 is reserved */
 #ifndef TkMacDispatchMenuEvent
 #define TkMacDispatchMenuEvent \
 	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 21 */
@@ -683,19 +658,13 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkMacInstallCursor \
 	(tkIntPlatStubsPtr->tkMacInstallCursor) /* 22 */
 #endif
-#ifndef TkMacConvertTkEvent
-#define TkMacConvertTkEvent \
-	(tkIntPlatStubsPtr->tkMacConvertTkEvent) /* 23 */
-#endif
+/* Slot 23 is reserved */
 #ifndef TkMacHandleTearoffMenu
 #define TkMacHandleTearoffMenu \
 	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 24 */
 #endif
 /* Slot 25 is reserved */
-#ifndef TkMacInvalClipRgns
-#define TkMacInvalClipRgns \
-	(tkIntPlatStubsPtr->tkMacInvalClipRgns) /* 26 */
-#endif
+/* Slot 26 is reserved */
 #ifndef TkMacDoHLEvent
 #define TkMacDoHLEvent \
 	(tkIntPlatStubsPtr->tkMacDoHLEvent) /* 27 */
@@ -705,10 +674,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkMacGenerateTime \
 	(tkIntPlatStubsPtr->tkMacGenerateTime) /* 29 */
 #endif
-#ifndef TkMacGetDrawablePort
-#define TkMacGetDrawablePort \
-	(tkIntPlatStubsPtr->tkMacGetDrawablePort) /* 30 */
-#endif
+/* Slot 30 is reserved */
 #ifndef TkMacGetScrollbarGrowWindow
 #define TkMacGetScrollbarGrowWindow \
 	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 31 */
@@ -725,18 +691,9 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkMacHandleMenuSelect \
 	(tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 34 */
 #endif
-#ifndef TkMacHaveAppearance
-#define TkMacHaveAppearance \
-	(tkIntPlatStubsPtr->tkMacHaveAppearance) /* 35 */
-#endif
-#ifndef TkMacInitAppleEvents
-#define TkMacInitAppleEvents \
-	(tkIntPlatStubsPtr->tkMacInitAppleEvents) /* 36 */
-#endif
-#ifndef TkMacInitMenus
-#define TkMacInitMenus \
-	(tkIntPlatStubsPtr->tkMacInitMenus) /* 37 */
-#endif
+/* Slot 35 is reserved */
+/* Slot 36 is reserved */
+/* Slot 37 is reserved */
 #ifndef TkMacInvalidateWindow
 #define TkMacInvalidateWindow \
 	(tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 38 */
@@ -840,6 +797,10 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkMacPreprocessMenu \
 	(tkIntPlatStubsPtr->tkMacPreprocessMenu) /* 65 */
 #endif
+#ifndef TkpIsWindowFloating
+#define TkpIsWindowFloating \
+	(tkIntPlatStubsPtr->tkpIsWindowFloating) /* 66 */
+#endif
 #endif /* MAC_TCL */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 42d31f1..4fad91e 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.9 2001/09/24 22:14:38 dgp Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.10 2001/11/23 02:06:48 das Exp $
  */
 
 #include <ctype.h>
@@ -55,7 +55,11 @@ 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
 extern void		TkpDisplayWarning _ANSI_ARGS_((char *msg,
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 106b547..a8757b0 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.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: tkPack.c,v 1.13 2001/09/26 20:25:17 pspjuth Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.14 2001/11/23 02:06:57 das Exp $
  */
 
 #include "tkPort.h"
@@ -1221,7 +1221,7 @@ PackAfter(interp, prevPtr, masterPtr, objc, objv)
 	packPtr->flags |= OLD_STYLE;
 	for (index = 0 ; index < optionCount; index++) {
 	    Tcl_Obj *curOptPtr = options[index];
-	    char *curOpt = Tcl_GetStringFromObj(curOptPtr, &length);
+	    char *curOpt = Tcl_GetStringFromObj(curOptPtr, (int *) &length);
 
 	    c = curOpt[0];
 
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index d14074d..c1a971b 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPointer.c,v 1.4 1999/04/16 01:51:21 stanton Exp $
+ * RCS: @(#) $Id: tkPointer.c,v 1.5 2001/11/23 02:07:02 das Exp $
  */
 
 #include "tkInt.h"
@@ -21,6 +21,7 @@
 #endif
 
 #ifdef MAC_TCL
+#include "tkMacInt.h"
 #define Cursor XCursor
 #endif
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 9710089..2d3a211 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -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: tkStubInit.c,v 1.28 2001/09/26 20:25:17 pspjuth Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.29 2001/11/23 02:07:07 das Exp $
  */
 
 #include "tkInt.h"
@@ -223,15 +223,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkUnionRectWithRegion, /* 119 */
 #endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     NULL, /* 120 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 120 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkGenerateActivateEvents, /* 120 */
-#endif /* MAC_TCL */
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     NULL, /* 121 */
 #endif /* UNIX */
@@ -250,15 +242,7 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkpDefineNativeBitmaps, /* 122 */
 #endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    NULL, /* 123 */
-#endif /* UNIX */
-#ifdef __WIN32__
     NULL, /* 123 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkpGetMS, /* 123 */
-#endif /* MAC_TCL */
 #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     NULL, /* 124 */
 #endif /* UNIX */
@@ -268,80 +252,16 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkpGetNativeAppBitmap, /* 124 */
 #endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    NULL, /* 125 */
-#endif /* UNIX */
-#ifdef __WIN32__
     NULL, /* 125 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkPointerDeadWindow, /* 125 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     NULL, /* 126 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 126 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkpSetCapture, /* 126 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    NULL, /* 127 */
-#endif /* UNIX */
-#ifdef __WIN32__
     NULL, /* 127 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkpSetCursor, /* 127 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     NULL, /* 128 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 128 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkpWmSetState, /* 128 */
-#endif /* MAC_TCL */
     NULL, /* 129 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    NULL, /* 130 */
-#endif /* UNIX */
-#ifdef __WIN32__
     NULL, /* 130 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkGetTransientMaster, /* 130 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     NULL, /* 131 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 131 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkGenerateButtonEvent, /* 131 */
-#endif /* MAC_TCL */
     NULL, /* 132 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
     NULL, /* 133 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 133 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkGenWMDestroyEvent, /* 133 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    NULL, /* 134 */
-#endif /* UNIX */
-#ifdef __WIN32__
     NULL, /* 134 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TkGenWMConfigureEvent, /* 134 */
-#endif /* MAC_TCL */
     TkpDrawHighlightBorder, /* 135 */
     TkSetFocusWin, /* 136 */
     TkpSetKeycodeAndState, /* 137 */
@@ -402,8 +322,8 @@ TkIntPlatStubs tkIntPlatStubs = {
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
     TkGenerateActivateEvents, /* 0 */
-    TkpCreateNativeBitmap, /* 1 */
-    TkpDefineNativeBitmaps, /* 2 */
+    NULL, /* 1 */
+    NULL, /* 2 */
     TkpGetMS, /* 3 */
     NULL, /* 4 */
     TkPointerDeadWindow, /* 5 */
@@ -418,27 +338,27 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkGenerateButtonEvent, /* 14 */
     NULL, /* 15 */
     TkGenWMDestroyEvent, /* 16 */
-    TkGenWMConfigureEvent, /* 17 */
+    NULL, /* 17 */
     TkMacButtonKeyState, /* 18 */
     TkMacClearMenubarActive, /* 19 */
-    TkMacConvertEvent, /* 20 */
+    NULL, /* 20 */
     TkMacDispatchMenuEvent, /* 21 */
     TkMacInstallCursor, /* 22 */
-    TkMacConvertTkEvent, /* 23 */
+    NULL, /* 23 */
     TkMacHandleTearoffMenu, /* 24 */
     NULL, /* 25 */
-    TkMacInvalClipRgns, /* 26 */
+    NULL, /* 26 */
     TkMacDoHLEvent, /* 27 */
     NULL, /* 28 */
     TkMacGenerateTime, /* 29 */
-    TkMacGetDrawablePort, /* 30 */
+    NULL, /* 30 */
     TkMacGetScrollbarGrowWindow, /* 31 */
     TkMacGetXWindow, /* 32 */
     TkMacGrowToplevel, /* 33 */
     TkMacHandleMenuSelect, /* 34 */
-    TkMacHaveAppearance, /* 35 */
-    TkMacInitAppleEvents, /* 36 */
-    TkMacInitMenus, /* 37 */
+    NULL, /* 35 */
+    NULL, /* 36 */
+    NULL, /* 37 */
     TkMacInvalidateWindow, /* 38 */
     TkMacIsCharacterMissing, /* 39 */
     TkMacMakeRealWindowExist, /* 40 */
@@ -467,6 +387,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkMacContainerId, /* 63 */
     TkMacGetHostToplevel, /* 64 */
     TkMacPreprocessMenu, /* 65 */
+    TkpIsWindowFloating, /* 66 */
 #endif /* MAC_TCL */
 };
 
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index 1783e32..d8e3f05 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -10,19 +10,9 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubLib.c,v 1.6 2001/05/22 00:22:41 hobbs Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.7 2001/11/23 02:07:11 das Exp $
  */
 
-/*
- * Because of problems with pre-compiled headers on the Mac, we need to
- * do these includes before we add the stubs defines.  This a hack.
- */
-
-#ifdef MAC_TCL
-#include "tkMacInt.h"
-#include "tkInt.h"
-#include "tkPort.h"
-#endif /* MAC_TCL */
 
 /*
  * We need to ensure that we use the stub macros so that this file contains
@@ -41,8 +31,6 @@
 #endif
 #undef USE_TK_STUB_PROCS
 
-#ifndef MAC_TCL
-
 #include "tkPort.h"
 #include "tkInt.h"
 
@@ -50,7 +38,9 @@
 #include "tkWinInt.h"
 #endif
 
-#endif /* !MAC_TCL */
+#ifdef MAC_TCL
+#include "tkMacInt.h"
+#endif
 
 #include "tkDecls.h"
 #include "tkIntDecls.h"