Merge 9.0

37 files changed, 1067 insertions, 2439 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 68da8b5..0c9b8f8 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -326,9 +326,6 @@ declare 75 {
 declare 76 {
     void Tk_FreeTextLayout(Tk_TextLayout textLayout)
 }
-declare 77 {deprecated {function does nothing, call can be removed}} {
-    void Tk_FreeXId(Display *display, XID xid)
-}
 declare 78 {
     GC Tk_GCForColor(XColor *colorPtr, Drawable drawable)
 }
@@ -475,9 +472,6 @@ declare 117 {
     void Tk_ImageChanged(Tk_ImageModel model, int x, int y,
 	    int width, int height, int imageWidth, int imageHeight)
 }
-declare 118 {
-    int Tk_Init(Tcl_Interp *interp)
-}
 declare 119 {
     Atom Tk_InternAtom(Tk_Window tkwin, const char *name)
 }
@@ -564,32 +558,15 @@ declare 143 {
 	    Tk_Window tkwin, int *argcPtr, const char **argv,
 	    const Tk_ArgvInfo *argTable, int flags)
 }
-declare 144 {deprecated {function signature changed}} {
-    void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
-	    Tk_PhotoImageBlock *blockPtr, int x, int y,
-	    int width, int height)
-}
-declare 145 {deprecated {function signature changed}} {
-    void Tk_PhotoPutZoomedBlock_NoComposite(Tk_PhotoHandle handle,
-	    Tk_PhotoImageBlock *blockPtr, int x, int y,
-	    int width, int height, int zoomX, int zoomY,
-	    int subsampleX, int subsampleY)
-}
 declare 146 {
     int Tk_PhotoGetImage(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr)
 }
 declare 147 {
     void Tk_PhotoBlank(Tk_PhotoHandle handle)
 }
-declare 148 {deprecated {function signature changed}} {
-    void Tk_PhotoExpand_Panic(Tk_PhotoHandle handle, int width, int height )
-}
 declare 149 {
     void Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr, int *heightPtr)
 }
-declare 150 {deprecated {function signature changed}} {
-    void Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle, int width, int height)
-}
 declare 151 {
     int Tk_PointToChar(Tk_TextLayout layout, int x, int y)
 }
@@ -617,9 +594,6 @@ declare 158 {
     Tk_RestrictProc *Tk_RestrictEvents(Tk_RestrictProc *proc,
 	    void *arg, void **prevArgPtr)
 }
-declare 159 {
-    int Tk_SafeInit(Tcl_Interp *interp)
-}
 declare 160 {
     const char *Tk_SetAppName(Tk_Window tkwin, const char *name)
 }
@@ -805,10 +779,6 @@ declare 211 {
     int	 Tk_InitOptions(Tcl_Interp *interp, void *recordPtr,
 	    Tk_OptionTable optionToken, Tk_Window tkwin)
 }
-declare 212 {nostub {Don't use this function in a stub-enabled extension}} {
-    void  Tk_MainEx(Tcl_Size argc, char **argv, Tcl_AppInitProc *appInitProc,
-	    Tcl_Interp *interp)
-}
 declare 213 {
     void  Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr)
 }
@@ -821,9 +791,6 @@ declare 214 {
 declare 215 {
     void Tk_InitConsoleChannels(Tcl_Interp *interp)
 }
-declare 216 {
-    int Tk_CreateConsoleWindow(Tcl_Interp *interp)
-}
 declare 217 {
     void Tk_CreateSmoothMethod(Tcl_Interp *interp, const Tk_SmoothMethod *method)
 }
@@ -943,17 +910,6 @@ declare 244 {
 declare 245 {
     void Tk_SetCaretPos(Tk_Window tkwin, int x, int y, int height)
 }
-declare 246 {deprecated {function signature changed}} {
-    void Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
-	    Tk_PhotoImageBlock *blockPtr, int x, int y,
-	    int width, int height, int compRule)
-}
-declare 247 {deprecated {function signature changed}} {
-    void Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle,
-	    Tk_PhotoImageBlock *blockPtr, int x, int y,
-	    int width, int height, int zoomX, int zoomY,
-	    int subsampleX, int subsampleY, int compRule)
-}
 declare 248 {
     int Tk_CollapseMotionEvents(Display *display, int collapse)
 }
@@ -989,12 +945,6 @@ declare 256 {
 declare 257 {
     Tk_Style  Tk_AllocStyleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
 }
-declare 258 {
-    Tk_Style Tk_GetStyleFromObj(Tcl_Obj *objPtr)
-}
-declare 259 {
-    void  Tk_FreeStyleFromObj(Tcl_Obj *objPtr)
-}
 declare 260 {
     Tk_StyledElement Tk_GetStyledElement(Tk_Style style, Tcl_Size elementId,
 	Tk_OptionTable optionTable)
@@ -1052,23 +1002,6 @@ declare 271 {
     Tcl_Interp *Tk_Interp(Tk_Window tkwin)
 }
 
-# Now that the Tk 8.2 -> 8.3 transition is long past, use more conventional
-# means to continue support for extensions using the USE_OLD_IMAGE to
-# continue use of their string-based Tcl_ImageTypes and Tcl_PhotoImageFormats.
-#
-# Note that this restores the usual rules for stub compatibility.  Stub-enabled
-# extensions compiled against 8.5 headers and linked to the 8.5 stub library
-# will produce a file [load]able into an interp with Tk 8.X, for X >= 5.
-# It will *not* be [load]able into interps with Tk 8.4 (or Tk 8.2!).
-# Developers who need to produce a file [load]able into legacy interps must
-# build against legacy sources.
-declare 272 {
-    void Tk_CreateOldImageType(const Tk_ImageType *typePtr)
-}
-declare 273 {
-    void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
-}
-
 # TIP#580
 declare 274 {
     int Tk_AlwaysShowSelection(Tk_Window tkwin)
@@ -1155,27 +1088,12 @@ declare 2 win {
 declare 3 win {
     Tk_Window Tk_HWNDToWindow(HWND hwnd)
 }
-declare 4 win {
-    void Tk_PointerEvent(HWND hwnd, int x, int y)
-}
-declare 5 win {
-    int Tk_TranslateWinEvent(HWND hwnd,
-	    UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result)
-}
 
 ################################
 # Aqua specific functions
-# Stub removed because the function no longer exists.
-#declare 3 aqua {
-#    void TkMacOSXInitMenus(Tcl_Interp *interp)
-#}
 declare 4 aqua {
     void TkMacOSXInitAppleEvents(Tcl_Interp *interp)
 }
-declare 5 aqua {
-    void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
-	    int height, int flags)
-}
 declare 6 aqua {
     void TkMacOSXInvalClipRgns(Tk_Window tkwin)
 }
diff --git a/generic/tk.h b/generic/tk.h
index 20a08e3..4f4d157 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -268,15 +268,6 @@ typedef struct Tk_ObjCustomOption {
 } Tk_ObjCustomOption;
 
 /*
- * Macro to use to fill in "offset" fields of the Tk_OptionSpec structure.
- * Computes number of bytes from beginning of structure to a given field.
- */
-
-#if !defined(TK_NO_DEPRECATED) && (TK_MAJOR_VERSION < 9) && !defined(BUILD_tk)
-#   define Tk_Offset(type, field) ((int) offsetof(type, field))
-#endif
-
-/*
  * The following two structures are used for error handling. When config
  * options are being modified, the old values are saved in a Tk_SavedOptions
  * structure. If an error occurs, then the contents of the structure can be
@@ -418,9 +409,6 @@ typedef enum {
 #define TK_CONFIG_COLOR_ONLY		(1 << 1)
 #define TK_CONFIG_MONO_ONLY		(1 << 2)
 #define TK_CONFIG_DONT_SET_DEFAULT	(1 << 3)
-#ifndef TK_NO_DEPRECATED
-#  define TK_CONFIG_OPTION_SPECIFIED      (1 << 4)
-#endif /* !TK_NO_DEPRECATED */
 #define TK_CONFIG_USER_BIT		0x100
 #endif /* __NO_OLD_CONFIG */
 
@@ -755,10 +743,6 @@ typedef XActivateDeactivateEvent XDeactivateEvent;
     (((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE)
 #define Tk_ReqWidth(tkwin)	(((Tk_FakeWin *) (tkwin))->reqWidth)
 #define Tk_ReqHeight(tkwin)	(((Tk_FakeWin *) (tkwin))->reqHeight)
-#ifndef TK_NO_DEPRECATED
-#define Tk_InternalBorderWidth(tkwin) \
-    (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
-#endif /* !TK_NO_DEPRECATED */
 #define Tk_InternalBorderLeft(tkwin) \
     (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
 #define Tk_InternalBorderRight(tkwin) \
@@ -1235,15 +1219,9 @@ typedef struct Tk_Outline {
  */
 
 typedef struct Tk_ImageType Tk_ImageType;
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 && defined(USE_OLD_IMAGE)
-typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, Tcl_Size argc,
-	char **argv, Tk_ImageType *typePtr, Tk_ImageModel model,
-	void **clientDataPtr);
-#else
 typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, const char *name, Tcl_Size objc,
 	Tcl_Obj *const objv[], const Tk_ImageType *typePtr, Tk_ImageModel model,
 	void **clientDataPtr);
-#endif /* USE_OLD_IMAGE */
 typedef void *(Tk_ImageGetProc) (Tk_Window tkwin, void *clientData);
 typedef void (Tk_ImageDisplayProc) (void *clientData, Display *display,
 	Drawable drawable, int imageX, int imageY, int width, int height,
@@ -1338,22 +1316,6 @@ typedef struct Tk_PhotoImageBlock {
  */
 
 typedef struct Tk_PhotoImageFormat Tk_PhotoImageFormat;
-#ifdef USE_OLD_IMAGE
-typedef int (Tk_ImageFileMatchProc) (Tcl_Channel chan, char *fileName,
-	char *formatString, int *widthPtr, int *heightPtr);
-typedef int (Tk_ImageStringMatchProc) (char *string, char *formatString,
-	int *widthPtr, int *heightPtr);
-typedef int (Tk_ImageFileReadProc) (Tcl_Interp *interp, Tcl_Channel chan,
-	char *fileName, char *formatString, Tk_PhotoHandle imageHandle,
-	int destX, int destY, int width, int height, int srcX, int srcY);
-typedef int (Tk_ImageStringReadProc) (Tcl_Interp *interp, char *string,
-	char *formatString, Tk_PhotoHandle imageHandle, int destX, int destY,
-	int width, int height, int srcX, int srcY);
-typedef int (Tk_ImageFileWriteProc) (Tcl_Interp *interp, char *fileName,
-	char *formatString, Tk_PhotoImageBlock *blockPtr);
-typedef int (Tk_ImageStringWriteProc) (Tcl_Interp *interp,
-	Tcl_DString *dataPtr, char *formatString, Tk_PhotoImageBlock *blockPtr);
-#else
 typedef int (Tk_ImageFileMatchProc) (Tcl_Channel chan, const char *fileName,
 	Tcl_Obj *format, int *widthPtr, int *heightPtr, Tcl_Interp *interp);
 typedef int (Tk_ImageStringMatchProc) (Tcl_Obj *dataObj, Tcl_Obj *format,
@@ -1368,7 +1330,6 @@ typedef int (Tk_ImageFileWriteProc) (Tcl_Interp *interp, const char *fileName,
 	Tcl_Obj *format, Tk_PhotoImageBlock *blockPtr);
 typedef int (Tk_ImageStringWriteProc) (Tcl_Interp *interp, Tcl_Obj *format,
 	Tk_PhotoImageBlock *blockPtr);
-#endif /* USE_OLD_IMAGE */
 
 /*
  * The following alternate definitions are used with the Tk8.7 file format
@@ -1537,48 +1498,11 @@ typedef struct Tk_ElementSpec {
  *----------------------------------------------------------------------
  *
  * The definitions below provide backward compatibility for functions and
- * types related to event handling that used to be in Tk but have moved to
- * Tcl.
+ * types that used to be in Tk but have moved to Tcl.
  *
  *----------------------------------------------------------------------
  */
 
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-#define TK_READABLE		TCL_READABLE
-#define TK_WRITABLE		TCL_WRITABLE
-#define TK_EXCEPTION		TCL_EXCEPTION
-
-#define TK_DONT_WAIT		TCL_DONT_WAIT
-#define TK_X_EVENTS		TCL_WINDOW_EVENTS
-#define TK_WINDOW_EVENTS	TCL_WINDOW_EVENTS
-#define TK_FILE_EVENTS		TCL_FILE_EVENTS
-#define TK_TIMER_EVENTS		TCL_TIMER_EVENTS
-#define TK_IDLE_EVENTS		TCL_IDLE_EVENTS
-#define TK_ALL_EVENTS		TCL_ALL_EVENTS
-
-#define Tk_IdleProc		Tcl_IdleProc
-#define Tk_FileProc		Tcl_FileProc
-#define Tk_TimerProc		Tcl_TimerProc
-#define Tk_TimerToken		Tcl_TimerToken
-
-#define Tk_BackgroundError	Tcl_BackgroundError
-#define Tk_CancelIdleCall	Tcl_CancelIdleCall
-#define Tk_CreateFileHandler	Tcl_CreateFileHandler
-#define Tk_CreateTimerHandler	Tcl_CreateTimerHandler
-#define Tk_DeleteFileHandler	Tcl_DeleteFileHandler
-#define Tk_DeleteTimerHandler	Tcl_DeleteTimerHandler
-#define Tk_DoOneEvent		Tcl_DoOneEvent
-#define Tk_DoWhenIdle		Tcl_DoWhenIdle
-#define Tk_Sleep		Tcl_Sleep
-
-/* Additional stuff that has moved to Tcl: */
-
-#define Tk_EventuallyFree	Tcl_EventuallyFree
-#define Tk_FreeProc		Tcl_FreeProc
-#define Tk_Preserve		Tcl_Preserve
-#define Tk_Release		Tcl_Release
-#endif
-
 /* Removed Tk_Main, use macro instead */
 #if defined(_WIN32) || defined(__CYGWIN__)
 #define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \
@@ -1629,58 +1553,6 @@ typedef Tcl_Size (Tk_SelectionProc) (void *clientData, Tcl_Size offset,
 
 #include "tkDecls.h"
 
-#ifdef USE_OLD_IMAGE
-#undef Tk_CreateImageType
-#define Tk_CreateImageType		Tk_CreateOldImageType
-#undef Tk_CreatePhotoImageFormat
-#define Tk_CreatePhotoImageFormat	Tk_CreateOldPhotoImageFormat
-#endif /* USE_OLD_IMAGE */
-
-/*
- *----------------------------------------------------------------------
- *
- * Allow users to say that they don't want to alter their source to add extra
- * arguments to Tk_PhotoPutBlock() et al.
- *
- * This goes after the inclusion of the stubbed-decls so that the declarations
- * of what is actually there can be correct.
- */
-
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-#ifdef USE_COMPOSITELESS_PHOTO_PUT_BLOCK
-#   ifdef Tk_PhotoPutBlock
-#	undef Tk_PhotoPutBlock
-#   endif
-#   define Tk_PhotoPutBlock		Tk_PhotoPutBlock_NoComposite
-#   ifdef Tk_PhotoPutZoomedBlock
-#	undef Tk_PhotoPutZoomedBlock
-#   endif
-#   define Tk_PhotoPutZoomedBlock	Tk_PhotoPutZoomedBlock_NoComposite
-#   define USE_PANIC_ON_PHOTO_ALLOC_FAILURE
-#else /* !USE_COMPOSITELESS_PHOTO_PUT_BLOCK */
-#   ifdef USE_PANIC_ON_PHOTO_ALLOC_FAILURE
-#	ifdef Tk_PhotoPutBlock
-#	    undef Tk_PhotoPutBlock
-#	endif
-#	define Tk_PhotoPutBlock		Tk_PhotoPutBlock_Panic
-#	ifdef Tk_PhotoPutZoomedBlock
-#	    undef Tk_PhotoPutZoomedBlock
-#	endif
-#	define Tk_PhotoPutZoomedBlock	Tk_PhotoPutZoomedBlock_Panic
-#   endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */
-#endif /* USE_COMPOSITELESS_PHOTO_PUT_BLOCK */
-#ifdef USE_PANIC_ON_PHOTO_ALLOC_FAILURE
-#   ifdef Tk_PhotoExpand
-#	undef Tk_PhotoExpand
-#   endif
-#   define Tk_PhotoExpand		Tk_PhotoExpand_Panic
-#   ifdef Tk_PhotoSetSize
-#	undef Tk_PhotoSetSize
-#   endif
-#   define Tk_PhotoSetSize		Tk_PhotoSetSize_Panic
-#endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */
-#endif /* !TK_NO_DEPRECATED */
-
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index a8c8ed1..e57e0f1 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.c
@@ -150,11 +150,7 @@ UnderlinePrintProc(
     char *p;
 
     if (underline == INT_MIN) {
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-	p = (char *)"-1";
-#else
 	p = (char *)"";
-#endif
 	*freeProcPtr = TCL_STATIC;
 	return p;
     } else if (underline == INT_MAX) {
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 06b7be1..d94f771 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -3296,8 +3296,8 @@ CanvasEventProc(
 
 	/*
 	 * Special hack: if the canvas is unmapped, then must notify all items
-	 * with "alwaysRedraw" set, so that they know that they are no longer
-	 * displayed.
+	 * with flag TK_ALWAYS_REDRAW set, so that they know that they are no
+	 * longer displayed.
 	 */
 
 	for (itemPtr = canvasPtr->firstItemPtr; itemPtr != NULL;
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 21d1a54..70b3254 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -288,9 +288,7 @@ EXTERN void		Tk_FreeOptions(const Tk_ConfigSpec *specs,
 EXTERN void		Tk_FreePixmap(Display *display, Pixmap pixmap);
 /* 76 */
 EXTERN void		Tk_FreeTextLayout(Tk_TextLayout textLayout);
-/* 77 */
-TK_DEPRECATED("function does nothing, call can be removed")
-void			Tk_FreeXId(Display *display, XID xid);
+/* Slot 77 is reserved */
 /* 78 */
 EXTERN GC		Tk_GCForColor(XColor *colorPtr, Drawable drawable);
 /* 79 */
@@ -413,8 +411,7 @@ EXTERN Tk_Window	Tk_IdToWindow(Display *display, Window window);
 EXTERN void		Tk_ImageChanged(Tk_ImageModel model, int x, int y,
 				int width, int height, int imageWidth,
 				int imageHeight);
-/* 118 */
-EXTERN int		Tk_Init(Tcl_Interp *interp);
+/* Slot 118 is reserved */
 /* 119 */
 EXTERN Atom		Tk_InternAtom(Tk_Window tkwin, const char *name);
 /* 120 */
@@ -476,34 +473,18 @@ EXTERN void		Tk_OwnSelection(Tk_Window tkwin, Atom selection,
 EXTERN int		Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin,
 				int *argcPtr, const char **argv,
 				const Tk_ArgvInfo *argTable, int flags);
-/* 144 */
-TK_DEPRECATED("function signature changed")
-void			Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
-				Tk_PhotoImageBlock *blockPtr, int x, int y,
-				int width, int height);
-/* 145 */
-TK_DEPRECATED("function signature changed")
-void			Tk_PhotoPutZoomedBlock_NoComposite(
-				Tk_PhotoHandle handle,
-				Tk_PhotoImageBlock *blockPtr, int x, int y,
-				int width, int height, int zoomX, int zoomY,
-				int subsampleX, int subsampleY);
+/* Slot 144 is reserved */
+/* Slot 145 is reserved */
 /* 146 */
 EXTERN int		Tk_PhotoGetImage(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr);
 /* 147 */
 EXTERN void		Tk_PhotoBlank(Tk_PhotoHandle handle);
-/* 148 */
-TK_DEPRECATED("function signature changed")
-void			Tk_PhotoExpand_Panic(Tk_PhotoHandle handle,
-				int width, int height);
+/* Slot 148 is reserved */
 /* 149 */
 EXTERN void		Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr,
 				int *heightPtr);
-/* 150 */
-TK_DEPRECATED("function signature changed")
-void			Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle,
-				int width, int height);
+/* Slot 150 is reserved */
 /* 151 */
 EXTERN int		Tk_PointToChar(Tk_TextLayout layout, int x, int y);
 /* 152 */
@@ -529,8 +510,7 @@ EXTERN int		Tk_RestackWindow(Tk_Window tkwin, int aboveBelow,
 /* 158 */
 EXTERN Tk_RestrictProc * Tk_RestrictEvents(Tk_RestrictProc *proc, void *arg,
 				void **prevArgPtr);
-/* 159 */
-EXTERN int		Tk_SafeInit(Tcl_Interp *interp);
+/* Slot 159 is reserved */
 /* 160 */
 EXTERN const char *	Tk_SetAppName(Tk_Window tkwin, const char *name);
 /* 161 */
@@ -679,10 +659,7 @@ EXTERN int		Tk_GetScrollInfoObj(Tcl_Interp *interp,
 /* 211 */
 EXTERN int		Tk_InitOptions(Tcl_Interp *interp, void *recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
-/* 212 */
-EXTERN void		Tk_MainEx(Tcl_Size argc, char **argv,
-				Tcl_AppInitProc *appInitProc,
-				Tcl_Interp *interp);
+/* Slot 212 is reserved */
 /* 213 */
 EXTERN void		Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr);
 /* 214 */
@@ -692,8 +669,7 @@ EXTERN int		Tk_SetOptions(Tcl_Interp *interp, void *recordPtr,
 				Tk_SavedOptions *savePtr, int *maskPtr);
 /* 215 */
 EXTERN void		Tk_InitConsoleChannels(Tcl_Interp *interp);
-/* 216 */
-EXTERN int		Tk_CreateConsoleWindow(Tcl_Interp *interp);
+/* Slot 216 is reserved */
 /* 217 */
 EXTERN void		Tk_CreateSmoothMethod(Tcl_Interp *interp,
 				const Tk_SmoothMethod *method);
@@ -785,17 +761,8 @@ EXTERN void		Tk_SetMinimumRequestSize(Tk_Window tkwin,
 /* 245 */
 EXTERN void		Tk_SetCaretPos(Tk_Window tkwin, int x, int y,
 				int height);
-/* 246 */
-TK_DEPRECATED("function signature changed")
-void			Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
-				Tk_PhotoImageBlock *blockPtr, int x, int y,
-				int width, int height, int compRule);
-/* 247 */
-TK_DEPRECATED("function signature changed")
-void			Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle,
-				Tk_PhotoImageBlock *blockPtr, int x, int y,
-				int width, int height, int zoomX, int zoomY,
-				int subsampleX, int subsampleY, int compRule);
+/* Slot 246 is reserved */
+/* Slot 247 is reserved */
 /* 248 */
 EXTERN int		Tk_CollapseMotionEvents(Display *display,
 				int collapse);
@@ -821,10 +788,8 @@ EXTERN const char *	Tk_NameOfStyle(Tk_Style style);
 /* 257 */
 EXTERN Tk_Style		Tk_AllocStyleFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
-/* 258 */
-EXTERN Tk_Style		Tk_GetStyleFromObj(Tcl_Obj *objPtr);
-/* 259 */
-EXTERN void		Tk_FreeStyleFromObj(Tcl_Obj *objPtr);
+/* Slot 258 is reserved */
+/* Slot 259 is reserved */
 /* 260 */
 EXTERN Tk_StyledElement	 Tk_GetStyledElement(Tk_Style style,
 				Tcl_Size elementId,
@@ -872,11 +837,8 @@ EXTERN long		Tk_GetUserInactiveTime(Display *dpy);
 EXTERN void		Tk_ResetUserInactiveTime(Display *dpy);
 /* 271 */
 EXTERN Tcl_Interp *	Tk_Interp(Tk_Window tkwin);
-/* 272 */
-EXTERN void		Tk_CreateOldImageType(const Tk_ImageType *typePtr);
-/* 273 */
-EXTERN void		Tk_CreateOldPhotoImageFormat(
-				const Tk_PhotoImageFormat *formatPtr);
+/* Slot 272 is reserved */
+/* Slot 273 is reserved */
 /* 274 */
 EXTERN int		Tk_AlwaysShowSelection(Tk_Window tkwin);
 /* 275 */
@@ -1014,7 +976,7 @@ typedef struct TkStubs {
     void (*tk_FreeOptions) (const Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags); /* 74 */
     void (*tk_FreePixmap) (Display *display, Pixmap pixmap); /* 75 */
     void (*tk_FreeTextLayout) (Tk_TextLayout textLayout); /* 76 */
-    TCL_DEPRECATED_API("function does nothing, call can be removed") void (*tk_FreeXId) (Display *display, XID xid); /* 77 */
+    void (*reserved77)(void);
     GC (*tk_GCForColor) (XColor *colorPtr, Drawable drawable); /* 78 */
     void (*tk_GeometryRequest) (Tk_Window tkwin, int reqWidth, int reqHeight); /* 79 */
     Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */
@@ -1055,7 +1017,7 @@ typedef struct TkStubs {
     void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */
     Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */
     void (*tk_ImageChanged) (Tk_ImageModel model, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
-    int (*tk_Init) (Tcl_Interp *interp); /* 118 */
+    void (*reserved118)(void);
     Atom (*tk_InternAtom) (Tk_Window tkwin, const char *name); /* 119 */
     int (*tk_IntersectTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height); /* 120 */
     void (*tk_MaintainGeometry) (Tk_Window window, Tk_Window container, int x, int y, int width, int height); /* 121 */
@@ -1081,13 +1043,13 @@ typedef struct TkStubs {
     Tk_Window (*tk_NameToWindow) (Tcl_Interp *interp, const char *pathName, Tk_Window tkwin); /* 141 */
     void (*tk_OwnSelection) (Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, void *clientData); /* 142 */
     int (*tk_ParseArgv) (Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, const char **argv, const Tk_ArgvInfo *argTable, int flags); /* 143 */
-    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height); /* 144 */
-    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutZoomedBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); /* 145 */
+    void (*reserved144)(void);
+    void (*reserved145)(void);
     int (*tk_PhotoGetImage) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr); /* 146 */
     void (*tk_PhotoBlank) (Tk_PhotoHandle handle); /* 147 */
-    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoExpand_Panic) (Tk_PhotoHandle handle, int width, int height); /* 148 */
+    void (*reserved148)(void);
     void (*tk_PhotoGetSize) (Tk_PhotoHandle handle, int *widthPtr, int *heightPtr); /* 149 */
-    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoSetSize_Panic) (Tk_PhotoHandle handle, int width, int height); /* 150 */
+    void (*reserved150)(void);
     int (*tk_PointToChar) (Tk_TextLayout layout, int x, int y); /* 151 */
     int (*tk_PostscriptFontName) (Tk_Font tkfont, Tcl_DString *dsPtr); /* 152 */
     void (*tk_PreserveColormap) (Display *display, Colormap colormap); /* 153 */
@@ -1096,7 +1058,7 @@ typedef struct TkStubs {
     void (*tk_ResizeWindow) (Tk_Window tkwin, int width, int height); /* 156 */
     int (*tk_RestackWindow) (Tk_Window tkwin, int aboveBelow, Tk_Window other); /* 157 */
     Tk_RestrictProc * (*tk_RestrictEvents) (Tk_RestrictProc *proc, void *arg, void **prevArgPtr); /* 158 */
-    int (*tk_SafeInit) (Tcl_Interp *interp); /* 159 */
+    void (*reserved159)(void);
     const char * (*tk_SetAppName) (Tk_Window tkwin, const char *name); /* 160 */
     void (*tk_SetBackgroundFromBorder) (Tk_Window tkwin, Tk_3DBorder border); /* 161 */
     void (*tk_SetClass) (Tk_Window tkwin, const char *className); /* 162 */
@@ -1149,11 +1111,11 @@ typedef struct TkStubs {
     int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */
     int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr); /* 210 */
     int (*tk_InitOptions) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
-    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") void (*tk_MainEx) (Tcl_Size argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */
+    void (*reserved212)(void);
     void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */
     int (*tk_SetOptions) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionTable, Tcl_Size objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */
     void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */
-    int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */
+    void (*reserved216)(void);
     void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, const Tk_SmoothMethod *method); /* 217 */
     void (*reserved218)(void);
     void (*reserved219)(void);
@@ -1183,8 +1145,8 @@ typedef struct TkStubs {
     void (*tk_SetInternalBorderEx) (Tk_Window tkwin, int left, int right, int top, int bottom); /* 243 */
     void (*tk_SetMinimumRequestSize) (Tk_Window tkwin, int minWidth, int minHeight); /* 244 */
     void (*tk_SetCaretPos) (Tk_Window tkwin, int x, int y, int height); /* 245 */
-    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
-    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */
+    void (*reserved246)(void);
+    void (*reserved247)(void);
     int (*tk_CollapseMotionEvents) (Display *display, int collapse); /* 248 */
     Tk_StyleEngine (*tk_RegisterStyleEngine) (const char *name, Tk_StyleEngine parent); /* 249 */
     Tk_StyleEngine (*tk_GetStyleEngine) (const char *name); /* 250 */
@@ -1195,8 +1157,8 @@ typedef struct TkStubs {
     void (*tk_FreeStyle) (Tk_Style style); /* 255 */
     const char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */
     Tk_Style (*tk_AllocStyleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 257 */
-    Tk_Style (*tk_GetStyleFromObj) (Tcl_Obj *objPtr); /* 258 */
-    void (*tk_FreeStyleFromObj) (Tcl_Obj *objPtr); /* 259 */
+    void (*reserved258)(void);
+    void (*reserved259)(void);
     Tk_StyledElement (*tk_GetStyledElement) (Tk_Style style, Tcl_Size elementId, Tk_OptionTable optionTable); /* 260 */
     void (*tk_GetElementSize) (Tk_Style style, Tk_StyledElement element, void *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr); /* 261 */
     void (*tk_GetElementBox) (Tk_Style style, Tk_StyledElement element, void *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 262 */
@@ -1209,8 +1171,8 @@ typedef struct TkStubs {
     long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */
     void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */
     Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
-    void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
-    void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */
+    void (*reserved272)(void);
+    void (*reserved273)(void);
     int (*tk_AlwaysShowSelection) (Tk_Window tkwin); /* 274 */
     unsigned (*tk_GetButtonMask) (unsigned button); /* 275 */
     int (*tk_GetDoublePixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 276 */
@@ -1396,8 +1358,7 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_FreePixmap) /* 75 */
 #define Tk_FreeTextLayout \
 	(tkStubsPtr->tk_FreeTextLayout) /* 76 */
-#define Tk_FreeXId \
-	(tkStubsPtr->tk_FreeXId) /* 77 */
+/* Slot 77 is reserved */
 #define Tk_GCForColor \
 	(tkStubsPtr->tk_GCForColor) /* 78 */
 #define Tk_GeometryRequest \
@@ -1478,8 +1439,7 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_IdToWindow) /* 116 */
 #define Tk_ImageChanged \
 	(tkStubsPtr->tk_ImageChanged) /* 117 */
-#define Tk_Init \
-	(tkStubsPtr->tk_Init) /* 118 */
+/* Slot 118 is reserved */
 #define Tk_InternAtom \
 	(tkStubsPtr->tk_InternAtom) /* 119 */
 #define Tk_IntersectTextLayout \
@@ -1530,20 +1490,16 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_OwnSelection) /* 142 */
 #define Tk_ParseArgv \
 	(tkStubsPtr->tk_ParseArgv) /* 143 */
-#define Tk_PhotoPutBlock_NoComposite \
-	(tkStubsPtr->tk_PhotoPutBlock_NoComposite) /* 144 */
-#define Tk_PhotoPutZoomedBlock_NoComposite \
-	(tkStubsPtr->tk_PhotoPutZoomedBlock_NoComposite) /* 145 */
+/* Slot 144 is reserved */
+/* Slot 145 is reserved */
 #define Tk_PhotoGetImage \
 	(tkStubsPtr->tk_PhotoGetImage) /* 146 */
 #define Tk_PhotoBlank \
 	(tkStubsPtr->tk_PhotoBlank) /* 147 */
-#define Tk_PhotoExpand_Panic \
-	(tkStubsPtr->tk_PhotoExpand_Panic) /* 148 */
+/* Slot 148 is reserved */
 #define Tk_PhotoGetSize \
 	(tkStubsPtr->tk_PhotoGetSize) /* 149 */
-#define Tk_PhotoSetSize_Panic \
-	(tkStubsPtr->tk_PhotoSetSize_Panic) /* 150 */
+/* Slot 150 is reserved */
 #define Tk_PointToChar \
 	(tkStubsPtr->tk_PointToChar) /* 151 */
 #define Tk_PostscriptFontName \
@@ -1560,8 +1516,7 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_RestackWindow) /* 157 */
 #define Tk_RestrictEvents \
 	(tkStubsPtr->tk_RestrictEvents) /* 158 */
-#define Tk_SafeInit \
-	(tkStubsPtr->tk_SafeInit) /* 159 */
+/* Slot 159 is reserved */
 #define Tk_SetAppName \
 	(tkStubsPtr->tk_SetAppName) /* 160 */
 #define Tk_SetBackgroundFromBorder \
@@ -1666,16 +1621,14 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_GetScrollInfoObj) /* 210 */
 #define Tk_InitOptions \
 	(tkStubsPtr->tk_InitOptions) /* 211 */
-#define Tk_MainEx \
-	(tkStubsPtr->tk_MainEx) /* 212 */
+/* Slot 212 is reserved */
 #define Tk_RestoreSavedOptions \
 	(tkStubsPtr->tk_RestoreSavedOptions) /* 213 */
 #define Tk_SetOptions \
 	(tkStubsPtr->tk_SetOptions) /* 214 */
 #define Tk_InitConsoleChannels \
 	(tkStubsPtr->tk_InitConsoleChannels) /* 215 */
-#define Tk_CreateConsoleWindow \
-	(tkStubsPtr->tk_CreateConsoleWindow) /* 216 */
+/* Slot 216 is reserved */
 #define Tk_CreateSmoothMethod \
 	(tkStubsPtr->tk_CreateSmoothMethod) /* 217 */
 /* Slot 218 is reserved */
@@ -1732,10 +1685,8 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_SetMinimumRequestSize) /* 244 */
 #define Tk_SetCaretPos \
 	(tkStubsPtr->tk_SetCaretPos) /* 245 */
-#define Tk_PhotoPutBlock_Panic \
-	(tkStubsPtr->tk_PhotoPutBlock_Panic) /* 246 */
-#define Tk_PhotoPutZoomedBlock_Panic \
-	(tkStubsPtr->tk_PhotoPutZoomedBlock_Panic) /* 247 */
+/* Slot 246 is reserved */
+/* Slot 247 is reserved */
 #define Tk_CollapseMotionEvents \
 	(tkStubsPtr->tk_CollapseMotionEvents) /* 248 */
 #define Tk_RegisterStyleEngine \
@@ -1756,10 +1707,8 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_NameOfStyle) /* 256 */
 #define Tk_AllocStyleFromObj \
 	(tkStubsPtr->tk_AllocStyleFromObj) /* 257 */
-#define Tk_GetStyleFromObj \
-	(tkStubsPtr->tk_GetStyleFromObj) /* 258 */
-#define Tk_FreeStyleFromObj \
-	(tkStubsPtr->tk_FreeStyleFromObj) /* 259 */
+/* Slot 258 is reserved */
+/* Slot 259 is reserved */
 #define Tk_GetStyledElement \
 	(tkStubsPtr->tk_GetStyledElement) /* 260 */
 #define Tk_GetElementSize \
@@ -1784,10 +1733,8 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
 #define Tk_Interp \
 	(tkStubsPtr->tk_Interp) /* 271 */
-#define Tk_CreateOldImageType \
-	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
-#define Tk_CreateOldPhotoImageFormat \
-	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
+/* Slot 272 is reserved */
+/* Slot 273 is reserved */
 #define Tk_AlwaysShowSelection \
 	(tkStubsPtr->tk_AlwaysShowSelection) /* 274 */
 #define Tk_GetButtonMask \
@@ -1827,40 +1774,22 @@ extern const TkStubs *tkStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-/* Functions that don't belong in the stub table */
-#undef Tk_MainEx
-#undef Tk_Init
-#undef Tk_SafeInit
-#undef Tk_CreateConsoleWindow
-
-#undef Tk_FreeXId
-#define Tk_FreeXId(display,xid)
-#undef Tk_GetStyleFromObj
-#undef Tk_FreeStyleFromObj
-#define Tk_GetStyleFromObj(obj) Tk_AllocStyleFromObj(NULL, obj)
-#define Tk_FreeStyleFromObj(obj) /* no-op */
 #define Tk_GetImageMasterData Tk_GetImageModelData
 
 #ifndef MAC_OSX_TK
 #   undef Tk_ClipDrawableToRect
 #endif
 
+EXTERN void  Tk_MainEx(Tcl_Size argc, char **argv,
+	Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 #if defined(_WIN32) && defined(UNICODE)
 #   define Tk_MainEx Tk_MainExW
     EXTERN void Tk_MainExW(Tcl_Size argc, wchar_t **argv,
 	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 #endif
-
-
-#if defined(TK_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
-#undef Tk_PhotoPutBlock_NoComposite
-#undef Tk_PhotoPutZoomedBlock_NoComposite
-#undef Tk_PhotoExpand_Panic
-#undef Tk_PhotoPutBlock_Panic
-#undef Tk_PhotoPutZoomedBlock_Panic
-#undef Tk_PhotoSetSize_Panic
-#undef Tk_CreateOldPhotoImageFormat
-#endif /* TK_NO_DEPRECATED */
+EXTERN int Tk_Init(Tcl_Interp *interp);
+EXTERN int Tk_SafeInit(Tcl_Interp *interp);
+EXTERN int Tk_CreateConsoleWindow(Tcl_Interp *interp);
 
 #if TK_MAJOR_VERSION < 9
 /* Restore 8.x signature of Tk_ConfigureWidget, but panic if TK_CONFIG_OBJS flag is not set */
@@ -1875,6 +1804,4 @@ extern const TkStubs *tkStubsPtr;
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-#undef TkUnusedStubEntry
-
 #endif /* _TKDECLS */
diff --git a/generic/tkImage.c b/generic/tkImage.c
index e34ced4..5290b7e 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -129,7 +129,7 @@ ImageTypeThreadExitProc(
 /*
  *----------------------------------------------------------------------
  *
- * Tk_CreateOldImageType, Tk_CreateImageType --
+ * Tk_CreateImageType --
  *
  *	This function is invoked by an image manager to tell Tk about a new
  *	kind of image and the functions that manage the new type. The function
@@ -146,27 +146,6 @@ ImageTypeThreadExitProc(
  */
 
 void
-Tk_CreateOldImageType(
-    const Tk_ImageType *typePtr)
-				/* Structure describing the type. All of the
-				 * fields except "nextPtr" must be filled in
-				 * by caller. */
-{
-    Tk_ImageType *copyPtr;
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
-	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
-
-    if (!tsdPtr->initialized) {
-	tsdPtr->initialized = 1;
-	Tcl_CreateThreadExitHandler(ImageTypeThreadExitProc, NULL);
-    }
-    copyPtr = (Tk_ImageType *)ckalloc(sizeof(Tk_ImageType));
-    *copyPtr = *typePtr;
-    copyPtr->nextPtr = tsdPtr->oldImageTypeList;
-    tsdPtr->oldImageTypeList = copyPtr;
-}
-
-void
 Tk_CreateImageType(
     const Tk_ImageType *typePtr)
 				/* Structure describing the type. All of the
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index b6596a6..55fb44f 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -139,11 +139,6 @@ typedef struct {
     Tk_PhotoImageFormat *formatList;
 				/* Pointer to the first in the list of known
 				 * photo image formats.*/
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-    Tk_PhotoImageFormat *oldFormatList;
-				/* Pointer to the first in the list of known
-				 * photo image formats.*/
-#endif
     Tk_PhotoImageFormatVersion3 *formatListVersion3;
 				/* Pointer to the first in the list of known
 				 * photo image formats in Version3 format.*/
@@ -247,13 +242,6 @@ PhotoFormatThreadExitProc(
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-    while (tsdPtr->oldFormatList != NULL) {
-	freePtr = tsdPtr->oldFormatList;
-	tsdPtr->oldFormatList = tsdPtr->oldFormatList->nextPtr;
-	ckfree(freePtr);
-    }
-#endif
     while (tsdPtr->formatList != NULL) {
 	freePtr = tsdPtr->formatList;
 	tsdPtr->formatList = tsdPtr->formatList->nextPtr;
@@ -271,7 +259,7 @@ PhotoFormatThreadExitProc(
 /*
  *----------------------------------------------------------------------
  *
- * Tk_CreateOldPhotoImageFormat, Tk_CreatePhotoImageFormat,
+ * Tk_CreatePhotoImageFormat,
  * Tk_CreatePhotoImageFormatVersion3 --
  *
  *	This function is invoked by an image file handler to register a new
@@ -288,29 +276,6 @@ PhotoFormatThreadExitProc(
  *----------------------------------------------------------------------
  */
 
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-void
-Tk_CreateOldPhotoImageFormat(
-    const Tk_PhotoImageFormat *formatPtr)
-				/* Structure describing the format. All of the
-				 * fields except "nextPtr" must be filled in
-				 * by caller. */
-{
-    Tk_PhotoImageFormat *copyPtr;
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
-	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
-
-    if (!tsdPtr->initialized) {
-	tsdPtr->initialized = 1;
-	Tcl_CreateThreadExitHandler(PhotoFormatThreadExitProc, NULL);
-    }
-    copyPtr = (Tk_PhotoImageFormat *)ckalloc(sizeof(Tk_PhotoImageFormat));
-    *copyPtr = *formatPtr;
-    copyPtr->nextPtr = tsdPtr->oldFormatList;
-    tsdPtr->oldFormatList = copyPtr;
-}
-#endif
-
 void
 Tk_CreatePhotoImageFormat(
     const Tk_PhotoImageFormat *formatPtr)
@@ -328,12 +293,6 @@ Tk_CreatePhotoImageFormat(
     }
     copyPtr = (Tk_PhotoImageFormat *)ckalloc(sizeof(Tk_PhotoImageFormat));
     *copyPtr = *formatPtr;
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-    if (isupper((unsigned char) *formatPtr->name)) {
-	copyPtr->nextPtr = tsdPtr->oldFormatList;
-	tsdPtr->oldFormatList = copyPtr;
-    } else
-#endif
     {
 	/* for compatibility with aMSN: make a copy of formatPtr->name */
 	char *name = (char *)ckalloc(strlen(formatPtr->name) + 1);
@@ -835,23 +794,6 @@ ImgPhotoCmd(
                 }
 	    }
 	}
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-	if (stringWriteProc == NULL) {
-	    oldformat = 1;
-	    for (imageFormat = tsdPtr->oldFormatList; imageFormat != NULL;
-                    imageFormat = imageFormat->nextPtr) {
-                if ((strncasecmp(Tcl_GetString(options.format),
-                        imageFormat->name,
-                        strlen(imageFormat->name)) == 0)) {
-                    matched = 1;
-                    if (imageFormat->stringWriteProc != NULL) {
-                        stringWriteProc = imageFormat->stringWriteProc;
-                        break;
-                    }
-                }
-	    }
-	}
-#endif
 	if (stringWriteProc == NULL) {
 	    oldformat = 0;
 	    for (imageFormatVersion3 = tsdPtr->formatListVersion3;
@@ -1512,22 +1454,6 @@ readCleanup:
 		}
 	    }
 	}
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-	if (imageFormat == NULL) {
-	    oldformat = 1;
-	    for (imageFormat = tsdPtr->oldFormatList; imageFormat != NULL;
-		    imageFormat = imageFormat->nextPtr) {
-		if ((fmtString == NULL)
-			|| (strncasecmp(fmtString, imageFormat->name,
-				strlen(imageFormat->name)) == 0)) {
-		    matched = 1;
-		    if (imageFormat->fileWriteProc != NULL) {
-			break;
-		    }
-		}
-	    }
-	}
-#endif
 	if (imageFormat == NULL) {
 	    oldformat = 0;
 	    for (imageFormatVersion3 = tsdPtr->formatListVersion3;
@@ -2778,42 +2704,6 @@ MatchFileFormat(
 	    }
 	}
     }
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-if (formatPtr == NULL) {
-	useoldformat = 1;
-	for (formatPtr = tsdPtr->oldFormatList; formatPtr != NULL;
-		formatPtr = formatPtr->nextPtr) {
-	    if (formatString != NULL) {
-		if (strncasecmp(formatString,
-			formatPtr->name, strlen(formatPtr->name)) != 0) {
-		    continue;
-		}
-		matched = 1;
-		if (formatPtr->fileMatchProc == NULL) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "-file option isn't supported for %s images",
-			    formatString));
-		    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
-			    "NOT_FILE_FORMAT", NULL);
-		    return TCL_ERROR;
-		}
-	    }
-	    if (formatPtr->fileMatchProc != NULL) {
-		(void) Tcl_Seek(chan, Tcl_LongAsWide(0L), SEEK_SET);
-		if (formatPtr->fileMatchProc(chan, fileName, (Tcl_Obj *)
-			formatString, widthPtr, heightPtr, interp)) {
-		    if (*widthPtr < 1) {
-			*widthPtr = 1;
-		    }
-		    if (*heightPtr < 1) {
-			*heightPtr = 1;
-		    }
-		    break;
-		}
-	    }
-	}
-    }
-#endif
 
     /*
      * For old and not version 3 format, exit now with success
@@ -3011,38 +2901,6 @@ MatchStringFormat(
 	}
     }
 
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-    if (formatPtr == NULL) {
-	useoldformat = 1;
-	for (formatPtr = tsdPtr->oldFormatList; formatPtr != NULL;
-		formatPtr = formatPtr->nextPtr) {
-	    if (formatObj != NULL) {
-		if (strncasecmp(formatString,
-			formatPtr->name, strlen(formatPtr->name)) != 0) {
-		    continue;
-		}
-		matched = 1;
-		if (formatPtr->stringMatchProc == NULL) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "-data option isn't supported for %s images",
-			    formatString));
-		    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
-			    "NOT_DATA_FORMAT", NULL);
-		    return TCL_ERROR;
-		}
-	    }
-	    if ((formatPtr->stringMatchProc != NULL)
-		    && (formatPtr->stringReadProc != NULL)
-		    && formatPtr->stringMatchProc(
-			    (Tcl_Obj *) Tcl_GetString(data),
-			    (Tcl_Obj *) formatString,
-			    widthPtr, heightPtr, interp)) {
-		break;
-	    }
-	}
-    }
-#endif
-
     if (formatPtr == NULL) {
 	useoldformat = 0;
 	for (formatVersion3Ptr = tsdPtr->formatListVersion3;
@@ -4531,107 +4389,6 @@ ImgPhotoPostscript(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * Tk_PhotoPutBlock_NoComposite, Tk_PhotoPutZoomedBlock_NoComposite --
- *
- * These backward-compatibility functions just exist to fill slots in stubs
- * table. For the behaviour of *_NoComposite, refer to the corresponding
- * function without the extra suffix, except that the compositing rule is
- * always "overlay" and the function always panics on memory-allocation
- * failure.
- *
- *----------------------------------------------------------------------
- */
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-void
-Tk_PhotoPutBlock_NoComposite(
-    Tk_PhotoHandle handle,
-    Tk_PhotoImageBlock *blockPtr,
-    int x, int y, int width, int height)
-{
-    if (Tk_PhotoPutBlock(NULL, handle, blockPtr, x, y, width, height,
-	    TK_PHOTO_COMPOSITE_OVERLAY) != TCL_OK) {
-	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
-    }
-}
-
-void
-Tk_PhotoPutZoomedBlock_NoComposite(
-    Tk_PhotoHandle handle,
-    Tk_PhotoImageBlock *blockPtr,
-    int x, int y, int width, int height,
-    int zoomX, int zoomY, int subsampleX, int subsampleY)
-{
-    if (Tk_PhotoPutZoomedBlock(NULL, handle, blockPtr, x, y, width, height,
-	    zoomX, zoomY, subsampleX, subsampleY,
-	    TK_PHOTO_COMPOSITE_OVERLAY) != TCL_OK) {
-	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tk_PhotoExpand_Panic, Tk_PhotoPutBlock_Panic,
- * Tk_PhotoPutZoomedBlock_Panic, Tk_PhotoSetSize_Panic
- *
- * Backward compatibility functions for preserving the old behaviour (i.e.
- * panic on memory allocation failure) so that extensions do not need to be
- * significantly updated to take account of TIP #116. These call the new
- * interface (i.e. the interface without the extra suffix), but panic if an
- * error condition is returned.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tk_PhotoExpand_Panic(
-    Tk_PhotoHandle handle,
-    int width, int height)
-{
-    if (Tk_PhotoExpand(NULL, handle, width, height) != TCL_OK) {
-	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
-    }
-}
-
-void
-Tk_PhotoPutBlock_Panic(
-    Tk_PhotoHandle handle,
-    Tk_PhotoImageBlock *blockPtr,
-    int x, int y, int width, int height, int compRule)
-{
-    if (Tk_PhotoPutBlock(NULL, handle, blockPtr, x, y, width, height,
-	    compRule) != TCL_OK) {
-	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
-    }
-}
-
-void
-Tk_PhotoPutZoomedBlock_Panic(
-    Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr,
-    int x, int y, int width, int height,
-    int zoomX, int zoomY, int subsampleX, int subsampleY,
-    int compRule)
-{
-    if (Tk_PhotoPutZoomedBlock(NULL, handle, blockPtr, x, y, width, height,
-	    zoomX, zoomY, subsampleX, subsampleY, compRule) != TCL_OK) {
-	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
-    }
-}
-
-void
-Tk_PhotoSetSize_Panic(
-    Tk_PhotoHandle handle,
-    int width, int height)
-{
-    if (Tk_PhotoSetSize(NULL, handle, width, height) != TCL_OK) {
-	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
-    }
-}
-#endif /* TK_NO_DEPRECATED */
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 3d04961..e16a72b 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -226,9 +226,6 @@ declare 58 {
 declare 59 {
     void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name)
 }
-declare 60 {deprecated {renamed to Tk_GetOtherWindow}} {
-    TkWindow *TkpGetOtherWindow(TkWindow *winPtr)
-}
 declare 61 {
     TkWindow *TkpGetWrapperWindow(TkWindow *winPtr)
 }
@@ -239,15 +236,9 @@ declare 63 {
     void TkpInitializeMenuBindings(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable)
 }
-declare 64 {deprecated {renamed to Tk_MakeContainer}} {
-    void TkpMakeContainer(Tk_Window tkwin)
-}
 declare 65 {
     void TkpMakeMenuWindow(Tk_Window tkwin, int transient)
 }
-declare 66 {deprecated {renamed to Tk_MakeWindow}} {
-    Window TkpMakeWindow(TkWindow *winPtr, Window parent)
-}
 declare 67 {
     void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, const char *menuName)
 }
@@ -269,15 +260,6 @@ declare 72 {
 declare 73 {
     void TkpRedirectKeyEvent(TkWindow *winPtr, XEvent *eventPtr)
 }
-declare 74 {deprecated {renamed to Tk_SetMainMenubar}} {
-    void TkpSetMainMenubar(Tcl_Interp *interp, Tk_Window tkwin, const char *menuName)
-}
-declare 75 {deprecated {renamed to Tk_UseWindow}} {
-    int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, const char *string)
-}
-#
-# Slot 76 unused (WAS: TkpWindowWasRecentlyDeleted)
-#
 declare 77 {
     void TkQueueEventForAllChildren(TkWindow *winPtr, XEvent *eventPtr)
 }
@@ -302,16 +284,6 @@ declare 82 {
 declare 83 {
     void TkSelPropProc(XEvent *eventPtr)
 }
-
-# Exported publically as Tk_SetClassProcs in 8.4a2
-#declare 84 {
-#    void TkSetClassProcs(Tk_Window tkwin,
-#	    TkClassProcs *procs, void *instanceData)
-#}
-declare 85 {deprecated {renamed to Tk_SetWindowMenubar}} {
-    void TkSetWindowMenuBar(Tcl_Interp *interp, Tk_Window tkwin,
-	    const char *oldMenuName, const char *menuName)
-}
 declare 86 {
     KeySym TkStringToKeysym(const char *name)
 }
@@ -394,10 +366,6 @@ declare 109 {
 declare 110 {
     void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont)
 }
-declare 111 {deprecated {renamed to Tk_GetSystemDefault}} {
-    Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin,
-	    const char *dbName, const char *className)
-}
 declare 112 {
     void TkpMenuThreadInit(void)
 }
@@ -424,20 +392,16 @@ declare 119 {
     int XUnionRectWithRegion(XRectangle *rect,
 	    Region src, Region dr_return)
 }
-declare 121 aqua {
+declare 121 {
     Pixmap TkpCreateNativeBitmap(Display *display, const void *source)
 }
-declare 122 aqua {
+declare 122 {
     void TkpDefineNativeBitmaps(void)
 }
-declare 124 aqua {
+declare 124 {
     Pixmap TkpGetNativeAppBitmap(Display *display,
 	    const char *name, int *width, int *height)
 }
-declare 135 {deprecated {renamed to Tk_DrawHighlightBorder}} {
-    void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC,
-        int highlightWidth, Drawable drawable)
-}
 declare 136 {
     void TkSetFocusWin(TkWindow *winPtr, int force)
 }
@@ -666,58 +630,33 @@ declare 0 x11 {
 declare 2 x11 {
     void TkGenerateActivateEvents(TkWindow *winPtr, int active)
 }
-declare 3 x11 {
-    int TkpCmapStressed(Tk_Window tkwin, Colormap colormap)
-}
-declare 4 x11 {
-    void TkpSync(Display *display)
-}
-declare 5 x11 {
-    Window TkUnixContainerId(TkWindow *winPtr)
-}
 declare 6 x11 {
-    int TkUnixDoOneXEvent(Tcl_Time *timePtr)
-}
-declare 7 x11 {
-    void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar)
-}
-declare 8 x11 {
     int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
 }
 declare 9 x11 {
-    void TkWmCleanup(TkDisplay *dispPtr)
-}
-declare 10 x11 {
-    void TkSendCleanup(TkDisplay *dispPtr)
-}
-declare 12 x11 {
     int TkpWmSetState(TkWindow *winPtr, int state)
 }
 # only needed by tktest:
-declare 13 x11 {
-    int TkpTestsendCmd_(void *clientData, Tcl_Interp *interp, Tcl_Size objc,
-	    Tcl_Obj *const objv[])
-}
 declare 38 x11 {
-    int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap)
+    int TkpCmapStressed(Tk_Window tkwin, Colormap colormap)
 }
 declare 39 x11 {
-    void TkpSync_(Display *display)
+    void TkpSync(Display *display)
 }
 declare 40 x11 {
-    Window TkUnixContainerId_(TkWindow *winPtr)
+    Window TkUnixContainerId(TkWindow *winPtr)
 }
 declare 41 x11 {
-    int TkUnixDoOneXEvent_(Tcl_Time *timePtr)
+    int TkUnixDoOneXEvent(Tcl_Time *timePtr)
 }
 declare 42 x11 {
-    void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar)
+    void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar)
 }
 declare 43 x11 {
-    void TkWmCleanup_(TkDisplay *dispPtr)
+    void TkWmCleanup(TkDisplay *dispPtr)
 }
 declare 44 x11 {
-    void TkSendCleanup_(TkDisplay *dispPtr)
+    void TkSendCleanup(TkDisplay *dispPtr)
 }
 # only needed by tktest:
 declare 45 x11 {
@@ -729,7 +668,7 @@ declare 45 x11 {
 # Windows specific functions
 
 declare 0 win {
-    char *TkAlignImageData(XImage *image, int alignment, int bitOrder)
+    void TkCreateXEventSource(void)
 }
 declare 2 win {
     void TkGenerateActivateEvents(TkWindow *winPtr, int active)
@@ -832,7 +771,7 @@ declare 32 win {
 	    const char *dbName, const char *className)
 }
 declare 33 win {
-    int TkWinGetPlatformId(void)
+    char *TkAlignImageData(XImage *image, int alignment, int bitOrder)
 }
 
 # new for 8.4.1
@@ -851,10 +790,6 @@ declare 36 win {
 	    UINT message, WPARAM wParam, LPARAM lParam)
 }
 
-# new for 8.4.20+/8.5.12+, Cygwin only
-declare 37 win {
-    void TkCreateXEventSource(void)
-}
 declare 38 win {
     int TkpCmapStressed(Tk_Window tkwin, Colormap colormap)
 }
@@ -888,26 +823,26 @@ declare 47 win {
 ################################
 # Aqua specific functions
 
-declare 0 aqua {
-    void TkGenerateActivateEvents(TkWindow *winPtr, int active)
+declare 1 aqua {
+    void TkAboutDlg(void)
 }
 declare 2 aqua {
-    void TkGenerateActivateEvents_(TkWindow *winPtr, int active)
+    void TkGenerateActivateEvents(TkWindow *winPtr, int active)
 }
 declare 3 aqua {
-    void TkPointerDeadWindow(TkWindow *winPtr)
+    unsigned long TkpGetMS(void)
 }
 declare 4 aqua {
-    void TkpSetCapture(TkWindow *winPtr)
+    void TkPointerDeadWindow(TkWindow *winPtr)
 }
 declare 5 aqua {
     void TkpSetCursor(TkpCursor cursor)
 }
 declare 6 aqua {
-    void TkpWmSetState(TkWindow *winPtr, int state)
+    int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
 }
 declare 7 aqua {
-    void TkAboutDlg(void)
+    int TkpWmSetState(TkWindow *winPtr, int state)
 }
 declare 8 aqua {
     unsigned int TkMacOSXButtonKeyState(void)
@@ -918,10 +853,9 @@ declare 9 aqua {
 declare 10 aqua {
     int TkMacOSXDispatchMenuEvent(int menuID, int index)
 }
-# Now a static function
-# declare 11 aqua {
-#     void TkMacOSXInstallCursor(int resizeOverride)
-# }
+declare 11 aqua {
+    void TkpSetCapture(TkWindow *winPtr)
+}
 declare 12 aqua {
     void TkMacOSXHandleTearoffMenu(void)
 }
@@ -938,22 +872,9 @@ declare 18 aqua {
     void TkMacOSXHandleMenuSelect(short theMenu, unsigned short theItem,
 	    int optionKeyPressed)
 }
-
-# removed duplicates from tkPlat table(tk.decls)
-#declare 19 aqua {
-#    void TkMacOSXInitAppleEvents(Tcl_Interp *interp)
-#}
-#
-#declare 20 aqua {
-#    void TkMacOSXInitMenus(Tcl_Interp *interp)
-#}
-
 declare 21 aqua {
     void TkMacOSXInvalidateWindow(MacDrawable *macWin, int flag)
 }
-declare 22 aqua {
-    int TkMacOSXIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar)
-}
 declare 23 aqua {
     void TkMacOSXMakeRealWindowExist(TkWindow *winPtr)
 }
@@ -963,10 +884,6 @@ declare 24 aqua {
 declare 25 aqua {
     void TkMacOSXMenuClick(void)
 }
-# The corresponding Unregister was not a stub, and this should be static.
-#declare 26 aqua {
-#    void TkMacOSXRegisterOffScreenWindow(Window window, void *portPtr)
-#}
 declare 27 aqua {
     int TkMacOSXResizable(TkWindow *winPtr)
 }
@@ -976,19 +893,12 @@ declare 28 aqua {
 declare 29 aqua {
     void TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag)
 }
-declare 30 aqua {
-    void TkMacOSXSetUpClippingRgn(Drawable drawable)
-}
 declare 31 aqua {
     void TkMacOSXSetUpGraphicsPort(GC gc, void *destPort)
 }
 declare 32 aqua {
     void TkMacOSXUpdateClipRgn(TkWindow *winPtr)
 }
-# This was not implemented.  Perhaps meant to be OffScreen ?
-#declare 33 aqua {
-#    void TkMacOSXUnregisterMacWindow(void *portPtr)
-#}
 declare 34 aqua {
     int TkMacOSXUseMenuID(short macID)
 }
@@ -1041,16 +951,10 @@ declare 51 aqua {
 declare 52 aqua {
     void TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag)
 }
-declare 53 aqua {
-    unsigned long TkpGetMS(void)
-}
 # For Canvas3d, requested by Sean Woods
 declare 54 aqua {
     void *TkMacOSXDrawable(Drawable drawable)
 }
-declare 55 aqua {
-    int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
-}
 
 ##############################################################################
 
@@ -1594,348 +1498,350 @@ declare 6 macosx {
     Colormap XCreateColormap(Display *d, Window w, Visual *v, int i)
 }
 declare 7 macosx {
-    GContext XGContextFromGC(GC g)
+    Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+	    XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)
 }
-# second parameter was of type KeyCode
 declare 8 macosx {
-    KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i)
+    Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
+	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
+	    XColor _Xconst *x2)
 }
 declare 9 macosx {
-    KeySym XStringToKeysym(_Xconst char *c)
+    GContext XGContextFromGC(GC g)
 }
 declare 10 macosx {
-    Window XRootWindow(Display *d, int i)
+    XHostAddress *XListHosts(Display *d, int *i, Bool *b)
 }
+# second parameter was of type KeyCode
 declare 11 macosx {
-    XErrorHandler XSetErrorHandler(XErrorHandler x)
+    KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i)
 }
 declare 12 macosx {
-    Status XAllocColor(Display *d, Colormap c, XColor *xp)
+    KeySym XStringToKeysym(_Xconst char *c)
 }
 declare 13 macosx {
-    int XBell(Display *d, int i)
+    Window XRootWindow(Display *d, int i)
 }
 declare 14 macosx {
-    int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
-	    int i2, _Xconst unsigned char *c, int i3)
+    XErrorHandler XSetErrorHandler(XErrorHandler x)
 }
 declare 15 macosx {
-    int XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
-	    XSetWindowAttributes *x)
+    Status XIconifyWindow(Display *d, Window w, int i)
 }
 declare 16 macosx {
-    int XConfigureWindow(Display *d, Window w, unsigned int i,
-	    XWindowChanges *x)
+    Status XWithdrawWindow(Display *d, Window w, int i)
 }
 declare 17 macosx {
-    int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1,
-	    int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)
+    Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip)
 }
 declare 18 macosx {
-    int 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)
+    Status XAllocColor(Display *d, Colormap c, XColor *xp)
 }
 declare 19 macosx {
-    Pixmap XCreateBitmapFromData(Display *display, Drawable d,
-	    _Xconst char *data, unsigned int width, unsigned int height)
+    int XBell(Display *d, int i)
 }
 declare 20 macosx {
-    int XDefineCursor(Display *d, Window w, Cursor c)
+    int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
+	    int i2, _Xconst unsigned char *c, int i3)
 }
 declare 21 macosx {
-    int XDestroyWindow(Display *d, Window w)
+    int XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
+	    XSetWindowAttributes *x)
 }
 declare 22 macosx {
-    int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
-	    unsigned int ui1, unsigned int ui2, int i3, int i4)
+    int XClearWindow(Display *d, Window w)
 }
 declare 23 macosx {
-    int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
+    int XConfigureWindow(Display *d, Window w, unsigned int i,
+	    XWindowChanges *x)
 }
 declare 24 macosx {
-    int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
-	    unsigned int ui1, unsigned int ui2)
+    int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1,
+	    int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 declare 25 macosx {
-    int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
-	    unsigned int ui1, unsigned int ui2, int i3, int i4)
+    int 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 26 macosx {
-    int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
-	    int i1, int i2, int i3)
+    Pixmap XCreateBitmapFromData(Display *display, Drawable d,
+	    _Xconst char *data, unsigned int width, unsigned int height)
 }
 declare 27 macosx {
-    int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
+    int XDefineCursor(Display *d, Window w, Cursor c)
 }
 declare 28 macosx {
-    int XFreeColormap(Display *d, Colormap c)
+    int XDeleteProperty(Display *d, Window w, Atom a)
 }
 declare 29 macosx {
-    int XFreeColors(Display *d, Colormap c,
-	    unsigned long *ulp, int i, unsigned long ul)
+    int XDestroyWindow(Display *d, Window w)
 }
 declare 30 macosx {
-    int XFreeModifiermap(XModifierKeymap *x)
+    int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 declare 31 macosx {
-    Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1,
-	    int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3,
-	    unsigned int *ui4)
+    int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
 }
 declare 32 macosx {
-    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)
+    int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2)
 }
 declare 33 macosx {
-    int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t)
+    int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 declare 34 macosx {
-    int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui,
-	    int i1, int i2, Window w2, Cursor c, Time t)
+    int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
+	    int i1, int i2, int i3)
 }
 declare 35 macosx {
-    KeyCode XKeysymToKeycode(Display *d, KeySym k)
+    int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
 }
 declare 36 macosx {
-    int XMapWindow(Display *d, Window w)
+    int XForceScreenSaver(Display *d, int i)
 }
 declare 37 macosx {
-    int XMoveResizeWindow(Display *d, Window w, int i1, int i2,
-	    unsigned int ui1, unsigned int ui2)
+    int XFreeColormap(Display *d, Colormap c)
 }
 declare 38 macosx {
-    int XMoveWindow(Display *d, Window w, int i1, int i2)
+    int XFreeColors(Display *d, Colormap c,
+	    unsigned long *ulp, int i, unsigned long ul)
 }
 declare 39 macosx {
-    Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3,
-	    int *i1, int *i2, int *i3, int *i4, unsigned int *ui)
+    int XFreeCursor(Display *d, Cursor c)
 }
 declare 40 macosx {
-    int XRaiseWindow(Display *d, Window w)
+    int XFreeModifiermap(XModifierKeymap *x)
 }
 declare 41 macosx {
-    int XRefreshKeyboardMapping(XMappingEvent *x)
+    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 42 macosx {
-    int XResizeWindow(Display *d, Window w, unsigned int ui1,
-	    unsigned int ui2)
+    int XGetInputFocus(Display *d, Window *w, int *i)
 }
 declare 43 macosx {
-    int XSelectInput(Display *d, Window w, long l)
+    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 44 macosx {
-    Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
+    Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x)
 }
 declare 45 macosx {
-    int XSetIconName(Display *d, Window w, _Xconst char *c)
+    int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t)
 }
 declare 46 macosx {
-    int XSetInputFocus(Display *d, Window w, int i, Time t)
+    int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui,
+	    int i1, int i2, Window w2, Cursor c, Time t)
 }
 declare 47 macosx {
-    int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
+    KeyCode XKeysymToKeycode(Display *d, KeySym k)
 }
 declare 48 macosx {
-    int XSetWindowBackground(Display *d, Window w, unsigned long ul)
+    Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2,
+	    XColor *x1, XColor *x2)
 }
 declare 49 macosx {
-    int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
+    int XMapWindow(Display *d, Window w)
 }
 declare 50 macosx {
-    int XSetWindowBorder(Display *d, Window w, unsigned long ul)
+    int XMoveResizeWindow(Display *d, Window w, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2)
 }
 declare 51 macosx {
-    int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
+    int XMoveWindow(Display *d, Window w, int i1, int i2)
 }
 declare 52 macosx {
-    int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
+    int XNextEvent(Display *d, XEvent *x)
 }
 declare 53 macosx {
-    int XSetWindowColormap(Display *d, Window w, Colormap c)
+    int XPutBackEvent(Display *d, XEvent *x)
 }
 declare 54 macosx {
-    int XUngrabKeyboard(Display *d, Time t)
+    int XQueryColors(Display *d, Colormap c, XColor *x, int i)
 }
 declare 55 macosx {
-    int XUngrabPointer(Display *d, Time t)
+    Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3,
+	    int *i1, int *i2, int *i3, int *i4, unsigned int *ui)
 }
 declare 56 macosx {
-    int XUnmapWindow(Display *d, Window w)
+    Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
+	    Window **w4, unsigned int *ui)
 }
 declare 57 macosx {
-    int 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)
+    int XRaiseWindow(Display *d, Window w)
 }
 declare 58 macosx {
-    Status XParseColor(Display *display, Colormap map,
-          _Xconst char *spec, XColor *colorPtr)
+    int XRefreshKeyboardMapping(XMappingEvent *x)
 }
 declare 59 macosx {
-    GC XCreateGC(Display *display, Drawable d,
-	    unsigned long valuemask, XGCValues *values)
+    int XResizeWindow(Display *d, Window w, unsigned int ui1,
+	    unsigned int ui2)
 }
 declare 60 macosx {
-    int XFreeGC(Display *display, GC gc)
+    int XSelectInput(Display *d, Window w, long l)
 }
 declare 61 macosx {
-    Atom XInternAtom(Display *display, _Xconst char *atom_name,
-	    Bool only_if_exists)
+    Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
 }
 declare 62 macosx {
-    int XSetBackground(Display *display, GC gc, unsigned long foreground)
+    int XSetCommand(Display *d, Window w, char **c, int i)
 }
 declare 63 macosx {
-    int XSetForeground(Display *display, GC gc, unsigned long foreground)
+    int XSetIconName(Display *d, Window w, _Xconst char *c)
 }
 declare 64 macosx {
-    int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
+    int XSetInputFocus(Display *d, Window w, int i, Time t)
 }
 declare 65 macosx {
-    int XSetClipOrigin(Display *display, GC gc,
-	    int clip_x_origin, int clip_y_origin)
+    int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
 }
 declare 66 macosx {
-    int XSetTSOrigin(Display *display, GC gc,
-	    int ts_x_origin, int ts_y_origin)
+    int XSetWindowBackground(Display *d, Window w, unsigned long ul)
 }
 declare 67 macosx {
-    int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
+    int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
 }
 declare 68 macosx {
-    int XSetFont(Display *display, GC gc, Font font)
+    int XSetWindowBorder(Display *d, Window w, unsigned long ul)
 }
 declare 69 macosx {
-    int XSetArcMode(Display *display, GC gc, int arc_mode)
+    int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
 }
 declare 70 macosx {
-    int XSetStipple(Display *display, GC gc, Pixmap stipple)
+    int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
 }
 declare 71 macosx {
-    int XSetFillRule(Display *display, GC gc, int fill_rule)
+    int XSetWindowColormap(Display *d, Window w, Colormap c)
 }
 declare 72 macosx {
-    int XSetFillStyle(Display *display, GC gc, int fill_style)
+    Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1,
+	    int i2, int *i3, int *i4, Window *w3)
 }
 declare 73 macosx {
-    int XSetFunction(Display *display, GC gc, int function)
+    int XUngrabKeyboard(Display *d, Time t)
 }
 declare 74 macosx {
-    int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
-	    int line_style, int cap_style, int join_style)
+    int XUngrabPointer(Display *d, Time t)
 }
 declare 75 macosx {
-    int _XInitImageFuncPtrs(XImage *image)
+    int XUnmapWindow(Display *d, Window w)
 }
 declare 76 macosx {
-    XIC XCreateIC(XIM xim, ...)
+    int XWindowEvent(Display *d, Window w, long l, XEvent *x)
 }
 declare 77 macosx {
-    XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask,
-	    XVisualInfo *vinfo_template, int *nitems_return)
+    void XDestroyIC(XIC x)
 }
 declare 78 macosx {
-    void XSetWMClientMachine(Display *display, Window w,
-	    XTextProperty *text_prop)
+    Bool XFilterEvent(XEvent *x, Window w)
 }
 declare 79 macosx {
-    Status XStringListToTextProperty(char **list, int count,
-	    XTextProperty *text_prop_return)
+    int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i,
+	    KeySym *k, Status *s)
 }
 declare 80 macosx {
-    int XDrawSegments(Display *display, Drawable d, GC gc,
-	    XSegment *segments, int nsegments)
+    int 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 81 macosx {
-    int XForceScreenSaver(Display *display, int mode)
+    int XSetClipRectangles(Display *display, GC gc, int clip_x_origin,
+	    int clip_y_origin, XRectangle rectangles[], int n, int ordering)
 }
 declare 82 macosx {
-    int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
-	    int x2, int y2)
+    Status XParseColor(Display *display, Colormap map,
+          _Xconst char *spec, XColor *colorPtr)
 }
 declare 83 macosx {
-    int XFillRectangle(Display *display, Drawable d, GC gc,
-	    int x, int y, unsigned int width, unsigned int height)
+    GC XCreateGC(Display *display, Drawable d,
+	    unsigned long valuemask, XGCValues *values)
 }
 declare 84 macosx {
-    int XClearWindow(Display *d, Window w)
+    int XFreeGC(Display *display, GC gc)
 }
 declare 85 macosx {
-    int XDrawPoint(Display *display, Drawable d, GC gc, int x, int y)
+    Atom XInternAtom(Display *display, _Xconst char *atom_name,
+	    Bool only_if_exists)
 }
 declare 86 macosx {
-    int XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points,
-	    int npoints, int mode)
+    int XSetBackground(Display *display, GC gc, unsigned long foreground)
 }
 declare 87 macosx {
-    int 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)
+    int XSetForeground(Display *display, GC gc, unsigned long foreground)
 }
 declare 88 macosx {
-    int XQueryColor(Display *display, Colormap colormap, XColor *def_in_out)
+    int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
 }
 declare 89 macosx {
-    int XQueryColors(Display *display, Colormap colormap,
-	    XColor *defs_in_out, int ncolors)
+    int XSetClipOrigin(Display *display, GC gc,
+	    int clip_x_origin, int clip_y_origin)
 }
 declare 90 macosx {
-    Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
-	    Window **w4, unsigned int *ui)
+    int XSetTSOrigin(Display *display, GC gc,
+	    int ts_x_origin, int ts_y_origin)
 }
 declare 91 macosx {
-    int XSync(Display *display, Bool discard)
+    int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
 }
 declare 92 macosx {
-    Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1,
-	    int i2, int *i3, int *i4, Window *w3)
+    int XSetFont(Display *display, GC gc, Font font)
 }
 declare 93 macosx {
-    int XDeleteProperty(Display *d, Window w, Atom a)
+    int XSetArcMode(Display *display, GC gc, int arc_mode)
 }
 declare 94 macosx {
-    int XFreeCursor(Display *d, Cursor c)
+    int XSetStipple(Display *display, GC gc, Pixmap stipple)
 }
 declare 95 macosx {
-    int XGetInputFocus(Display *d, Window *w, int *i)
+    int XSetFillRule(Display *display, GC gc, int fill_rule)
 }
 declare 96 macosx {
-    int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i,
-	    KeySym *k, Status *s)
+    int XSetFillStyle(Display *display, GC gc, int fill_style)
 }
 declare 97 macosx {
-    int XNextEvent(Display *d, XEvent *x)
+    int XSetFunction(Display *display, GC gc, int function)
 }
 declare 98 macosx {
-    int XPutBackEvent(Display *d, XEvent *x)
+    int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
+	    int line_style, int cap_style, int join_style)
 }
 declare 99 macosx {
-    int XSetCommand(Display *d, Window w, char **c, int i)
+    int _XInitImageFuncPtrs(XImage *image)
 }
 declare 100 macosx {
-    int XWindowEvent(Display *d, Window w, long l, XEvent *x)
+    XIC XCreateIC(XIM xim, ...)
 }
 declare 101 macosx {
-    Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x)
+    XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask,
+	    XVisualInfo *vinfo_template, int *nitems_return)
 }
 declare 102 macosx {
-    Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip)
+    void XSetWMClientMachine(Display *display, Window w,
+	    XTextProperty *text_prop)
 }
 declare 103 macosx {
-    Status XIconifyWindow(Display *d, Window w, int i)
+    Status XStringListToTextProperty(char **list, int count,
+	    XTextProperty *text_prop_return)
 }
 declare 104 macosx {
-    Status XWithdrawWindow(Display *d, Window w, int i)
+    int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
+	    int x2, int y2)
 }
 declare 105 macosx {
-    XHostAddress *XListHosts(Display *d, int *i, Bool *b)
+    int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy,
+	    unsigned int sw, unsigned int sh, int dx, int dy)
 }
 declare 106 macosx {
-    int XSetClipRectangles(Display *display, GC gc, int clip_x_origin,
-       int clip_y_origin, XRectangle rectangles[], int n, int ordering)
+    int XFillRectangle(Display *display, Drawable d, GC gc,
+	    int x, int y, unsigned int width, unsigned int height)
 }
+
+# New in Tk 8.6
 declare 107 macosx {
     int XFlush(Display *display)
 }
@@ -1955,18 +1861,21 @@ declare 112 macosx {
     XAfterFunction XSynchronize(Display *display, Bool onoff)
 }
 declare 113 macosx {
-    Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2,
-	    XColor *x1, XColor *x2)
+    int XSync(Display *display, Bool discard)
 }
 declare 114 macosx {
     VisualID XVisualIDFromVisual(Visual *visual)
 }
+
+# For tktreectrl
 declare 120 macosx {
     int XOffsetRegion(Region rgn, int dx, int dy)
 }
 declare 121 macosx {
     int XUnionRegion(Region srca, Region srcb, Region dr_return)
 }
+
+# For 3dcanvas
 declare 122 macosx {
     Window XCreateWindow(Display *display, Window parent, int x, int y,
 	    unsigned int width, unsigned int height,
@@ -1974,6 +1883,8 @@ declare 122 macosx {
 	    Visual *visual, unsigned long value_mask,
 	    XSetWindowAttributes *attributes)
 }
+
+# Various, e.g. for stub-enabled BLT
 declare 129 macosx {
     int XLowerWindow(Display *d, Window w)
 }
@@ -1986,6 +1897,15 @@ declare 131 macosx {
 declare 132 macosx {
     int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n)
 }
+declare 133 macosx {
+    int XDrawSegments(Display *d, Drawable dr, GC gc, XSegment *s, int n)
+}
+declare 134 macosx {
+    int XDrawPoint(Display *d, Drawable dr, GC gc, int x, int y)
+}
+declare 135 macosx {
+    int XDrawPoints(Display *d, Drawable dr, GC gc, XPoint *p, int n, int m)
+}
 declare 136 macosx {
     int XReparentWindow(Display *d, Window w, Window p, int x, int y)
 }
@@ -2000,6 +1920,7 @@ declare 138 macosx {
 declare 139 macosx {
     int XPointInRegion(Region rgn, int x, int y)
 }
+# For XIM
 declare 140 macosx {
     XVaNestedList XVaCreateNestedList(int dummy, ...)
 }
@@ -2012,18 +1933,6 @@ declare 142 macosx {
 declare 143 macosx {
     void XSetICFocus(XIC xic)
 }
-declare 144 macosx {
-    void XDestroyIC(XIC xic)
-}
-declare 145 macosx {
-    Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
-	    XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)
-}
-declare 146 macosx {
-    Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
-	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
-	    XColor _Xconst *x2)
-}
 declare 147 macosx {
     void XFreeFontSet(Display *display, XFontSet fontset)
 }
diff --git a/generic/tkInt.h b/generic/tkInt.h
index ec6d243..d503e95 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -75,13 +75,6 @@
 #   endif
 #endif
 
-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 7)
-# define Tcl_WCharToUtfDString ((char * (*)(const WCHAR *, int len, Tcl_DString *))Tcl_UniCharToUtfDString)
-# define Tcl_UtfToWCharDString ((WCHAR * (*)(const char *, int len, Tcl_DString *))Tcl_UtfToUniCharDString)
-# define Tcl_Char16ToUtfDString Tcl_UniCharToUtfDString
-# define Tcl_UtfToChar16DString Tcl_UtfToUniCharDString
-#endif
-
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 #   define TKFLEXARRAY
 #elif defined(__GNUC__) && (__GNUC__ > 2)
@@ -90,10 +83,6 @@
 #   define TKFLEXARRAY 1
 #endif
 
-#if !defined(Tcl_GetParent) && (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
-#   define Tcl_GetParent Tcl_GetMaster
-#endif
-
 /*
  * Macros used to cast between pointers and integers (e.g. when storing an int
  * in ClientData), on 64-bit architectures they avoid gcc warning about "cast
@@ -556,21 +545,6 @@ typedef struct TkDisplay {
 				 * the display when we no longer have any Tk
 				 * applications using it. */
 
-    /*
-     * The following field were all added for Tk8.3
-     */
-
-#if TCL_MAJOR_VERSION < 9
-#if !defined(TK_NO_DEPRECATED)
-    int mouseButtonState;	/* Current mouse button state for this
-				 * display. NOT USED as of 8.6.10 */
-    Window mouseButtonWindow;	/* Window the button state was set in, added
-				 * in Tk 8.4. */
-#else
-    int notused1;
-    XID notused2;
-#endif /* !TK_NO_DEPRECATED */
-#endif
     Tk_Window warpWindow;
     Tk_Window warpMainwin;	/* For finding the root window for warping
 				 * purposes. */
@@ -723,7 +697,8 @@ typedef struct TkMainInfo {
 				 * Tcl's version of [update] after Tk is shut
 				 * down, in case it's a Tcl_ObjCmdProc2 */
 #endif
-
+    unsigned int ttkNbTabsStickBit;
+    				/* Information used by ttk::notebook. */
 } TkMainInfo;
 
 /*
@@ -1419,13 +1394,8 @@ MODULE_SCOPE void	TkRotatePoint(double originX, double originY,
 			    double *yPtr);
 MODULE_SCOPE int TkGetIntForIndex(Tcl_Obj *, Tcl_Size, int lastOK, Tcl_Size*);
 
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-#   define TkNewIndexObj(value) Tcl_NewWideIntObj((Tcl_WideInt)(value + 1) - 1)
-#   define TK_OPTION_UNDERLINE_DEF(type, field) "-1", TCL_INDEX_NONE, offsetof(type, field), 0, NULL
-#else
-#   define TkNewIndexObj(value) (((Tcl_Size)(value) == TCL_INDEX_NONE) ? Tcl_NewObj() : Tcl_NewWideIntObj((Tcl_WideInt)(value)))
-#   define TK_OPTION_UNDERLINE_DEF(type, field) NULL, TCL_INDEX_NONE, offsetof(type, field), TK_OPTION_NULL_OK, NULL
-#endif
+#define TkNewIndexObj(value) (((Tcl_Size)(value) == TCL_INDEX_NONE) ? Tcl_NewObj() : Tcl_NewWideIntObj((Tcl_WideInt)(value)))
+#define TK_OPTION_UNDERLINE_DEF(type, field) NULL, TCL_INDEX_NONE, offsetof(type, field), TK_OPTION_NULL_OK, NULL
 
 
 #ifdef _WIN32
@@ -1467,8 +1437,7 @@ MODULE_SCOPE void	TkpCopyRegion(TkRegion dst, TkRegion src);
 # define c_class class
 #endif
 
-/* Tcl 8.6 has a different definition of Tcl_UniChar than other Tcl versions for TCL_UTF_MAX > 3 */
-#if TCL_UTF_MAX > (3 + (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 6))
+#if TCL_UTF_MAX > 3
 #   define TkUtfToUniChar(src, ch) (size_t)(((int (*)(const char *, int *))Tcl_UtfToUniChar)(src, ch))
 #   define TkUniCharToUtf(ch, src) (size_t)(((int (*)(int, char *))Tcl_UniCharToUtf)(ch, src))
 #else
@@ -1496,7 +1465,6 @@ MODULE_SCOPE int	TkUnsupported1ObjCmd(void *clientData,
 MODULE_SCOPE int SquareObjCmd(void *clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
-MODULE_SCOPE int	TkOldTestInit(Tcl_Interp *interp);
 #if !(defined(_WIN32) || defined(MAC_OSX_TK))
 #define TkplatformtestInit(x) TCL_OK
 #else
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 6eeb6c5..c1ec37f 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -202,9 +202,7 @@ EXTERN void		TkpClaimFocus(TkWindow *topLevelPtr, int force);
 EXTERN void		TkpDisplayWarning(const char *msg, const char *title);
 /* 59 */
 EXTERN void		TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name);
-/* 60 */
-TK_DEPRECATED("renamed to Tk_GetOtherWindow")
-TkWindow *		TkpGetOtherWindow(TkWindow *winPtr);
+/* Slot 60 is reserved */
 /* 61 */
 EXTERN TkWindow *	TkpGetWrapperWindow(TkWindow *winPtr);
 /* 62 */
@@ -212,14 +210,10 @@ EXTERN int		TkpInit(Tcl_Interp *interp);
 /* 63 */
 EXTERN void		TkpInitializeMenuBindings(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable);
-/* 64 */
-TK_DEPRECATED("renamed to Tk_MakeContainer")
-void			TkpMakeContainer(Tk_Window tkwin);
+/* Slot 64 is reserved */
 /* 65 */
 EXTERN void		TkpMakeMenuWindow(Tk_Window tkwin, int transient);
-/* 66 */
-TK_DEPRECATED("renamed to Tk_MakeWindow")
-Window			TkpMakeWindow(TkWindow *winPtr, Window parent);
+/* Slot 66 is reserved */
 /* 67 */
 EXTERN void		TkpMenuNotifyToplevelCreate(Tcl_Interp *interp,
 				const char *menuName);
@@ -238,14 +232,8 @@ EXTERN int		TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr);
 /* 73 */
 EXTERN void		TkpRedirectKeyEvent(TkWindow *winPtr,
 				XEvent *eventPtr);
-/* 74 */
-TK_DEPRECATED("renamed to Tk_SetMainMenubar")
-void			TkpSetMainMenubar(Tcl_Interp *interp,
-				Tk_Window tkwin, const char *menuName);
-/* 75 */
-TK_DEPRECATED("renamed to Tk_UseWindow")
-int			TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *string);
+/* Slot 74 is reserved */
+/* Slot 75 is reserved */
 /* Slot 76 is reserved */
 /* 77 */
 EXTERN void		TkQueueEventForAllChildren(TkWindow *winPtr,
@@ -270,11 +258,7 @@ EXTERN void		TkSelInit(Tk_Window tkwin);
 /* 83 */
 EXTERN void		TkSelPropProc(XEvent *eventPtr);
 /* Slot 84 is reserved */
-/* 85 */
-TK_DEPRECATED("renamed to Tk_SetWindowMenubar")
-void			TkSetWindowMenuBar(Tcl_Interp *interp,
-				Tk_Window tkwin, const char *oldMenuName,
-				const char *menuName);
+/* Slot 85 is reserved */
 /* 86 */
 EXTERN KeySym		TkStringToKeysym(const char *name);
 /* 87 */
@@ -335,10 +319,7 @@ EXTERN const char *	TkpGetString(TkWindow *winPtr, XEvent *eventPtr,
 				Tcl_DString *dsPtr);
 /* 110 */
 EXTERN void		TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont);
-/* 111 */
-TK_DEPRECATED("renamed to Tk_GetSystemDefault")
-Tcl_Obj *		TkpGetSystemDefault(Tk_Window tkwin,
-				const char *dbName, const char *className);
+/* Slot 111 is reserved */
 /* 112 */
 EXTERN void		TkpMenuThreadInit(void);
 /* 113 */
@@ -359,21 +340,15 @@ EXTERN int		XSetRegion(Display *display, GC gc, Region rgn);
 EXTERN int		XUnionRectWithRegion(XRectangle *rect, Region src,
 				Region dr_return);
 /* Slot 120 is reserved */
-#ifdef MAC_OSX_TK /* AQUA */
 /* 121 */
 EXTERN Pixmap		TkpCreateNativeBitmap(Display *display,
 				const void *source);
-#endif /* AQUA */
-#ifdef MAC_OSX_TK /* AQUA */
 /* 122 */
 EXTERN void		TkpDefineNativeBitmaps(void);
-#endif /* AQUA */
 /* Slot 123 is reserved */
-#ifdef MAC_OSX_TK /* AQUA */
 /* 124 */
 EXTERN Pixmap		TkpGetNativeAppBitmap(Display *display,
 				const char *name, int *width, int *height);
-#endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
 /* Slot 127 is reserved */
@@ -384,11 +359,7 @@ EXTERN Pixmap		TkpGetNativeAppBitmap(Display *display,
 /* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
-/* 135 */
-TK_DEPRECATED("renamed to Tk_DrawHighlightBorder")
-void			TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC,
-				GC bgGC, int highlightWidth,
-				Drawable drawable);
+/* Slot 135 is reserved */
 /* 136 */
 EXTERN void		TkSetFocusWin(TkWindow *winPtr, int force);
 /* 137 */
@@ -637,13 +608,13 @@ typedef struct TkIntStubs {
     void (*tkpClaimFocus) (TkWindow *topLevelPtr, int force); /* 57 */
     void (*tkpDisplayWarning) (const char *msg, const char *title); /* 58 */
     void (*tkpGetAppName) (Tcl_Interp *interp, Tcl_DString *name); /* 59 */
-    TCL_DEPRECATED_API("renamed to Tk_GetOtherWindow") TkWindow * (*tkpGetOtherWindow) (TkWindow *winPtr); /* 60 */
+    void (*reserved60)(void);
     TkWindow * (*tkpGetWrapperWindow) (TkWindow *winPtr); /* 61 */
     int (*tkpInit) (Tcl_Interp *interp); /* 62 */
     void (*tkpInitializeMenuBindings) (Tcl_Interp *interp, Tk_BindingTable bindingTable); /* 63 */
-    TCL_DEPRECATED_API("renamed to Tk_MakeContainer") void (*tkpMakeContainer) (Tk_Window tkwin); /* 64 */
+    void (*reserved64)(void);
     void (*tkpMakeMenuWindow) (Tk_Window tkwin, int transient); /* 65 */
-    TCL_DEPRECATED_API("renamed to Tk_MakeWindow") Window (*tkpMakeWindow) (TkWindow *winPtr, Window parent); /* 66 */
+    void (*reserved66)(void);
     void (*tkpMenuNotifyToplevelCreate) (Tcl_Interp *interp, const char *menuName); /* 67 */
     TkDisplay * (*tkpOpenDisplay) (const char *display_name); /* 68 */
     int (*tkPointerEvent) (XEvent *eventPtr, TkWindow *winPtr); /* 69 */
@@ -651,8 +622,8 @@ typedef struct TkIntStubs {
     double (*tkPolygonToPoint) (double *polyPtr, int numPoints, double *pointPtr); /* 71 */
     int (*tkPositionInTree) (TkWindow *winPtr, TkWindow *treePtr); /* 72 */
     void (*tkpRedirectKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 73 */
-    TCL_DEPRECATED_API("renamed to Tk_SetMainMenubar") void (*tkpSetMainMenubar) (Tcl_Interp *interp, Tk_Window tkwin, const char *menuName); /* 74 */
-    TCL_DEPRECATED_API("renamed to Tk_UseWindow") int (*tkpUseWindow) (Tcl_Interp *interp, Tk_Window tkwin, const char *string); /* 75 */
+    void (*reserved74)(void);
+    void (*reserved75)(void);
     void (*reserved76)(void);
     void (*tkQueueEventForAllChildren) (TkWindow *winPtr, XEvent *eventPtr); /* 77 */
     int (*tkReadBitmapFile) (Display *display, Drawable d, const char *filename, unsigned int *width_return, unsigned int *height_return, Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return); /* 78 */
@@ -662,7 +633,7 @@ typedef struct TkIntStubs {
     void (*tkSelInit) (Tk_Window tkwin); /* 82 */
     void (*tkSelPropProc) (XEvent *eventPtr); /* 83 */
     void (*reserved84)(void);
-    TCL_DEPRECATED_API("renamed to Tk_SetWindowMenubar") void (*tkSetWindowMenuBar) (Tcl_Interp *interp, Tk_Window tkwin, const char *oldMenuName, const char *menuName); /* 85 */
+    void (*reserved85)(void);
     KeySym (*tkStringToKeysym) (const char *name); /* 86 */
     int (*tkThickPolyLineToArea) (double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr); /* 87 */
     void (*tkWmAddToColormapWindows) (TkWindow *winPtr); /* 88 */
@@ -688,7 +659,7 @@ typedef struct TkIntStubs {
     int (*tkGetWindowFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Tk_Window *windowPtr); /* 108 */
     const char * (*tkpGetString) (TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr); /* 109 */
     void (*tkpGetSubFonts) (Tcl_Interp *interp, Tk_Font tkfont); /* 110 */
-    TCL_DEPRECATED_API("renamed to Tk_GetSystemDefault") Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 111 */
+    void (*reserved111)(void);
     void (*tkpMenuThreadInit) (void); /* 112 */
     int (*xClipBox) (Region rgn, XRectangle *rect_return); /* 113 */
     Region (*xCreateRegion) (void); /* 114 */
@@ -698,37 +669,10 @@ typedef struct TkIntStubs {
     int (*xSetRegion) (Display *display, GC gc, Region rgn); /* 118 */
     int (*xUnionRectWithRegion) (XRectangle *rect, Region src, Region dr_return); /* 119 */
     void (*reserved120)(void);
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    void (*reserved121)(void);
-#endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    void (*reserved121)(void);
-#endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    void (*reserved121)(void); /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpCreateNativeBitmap) (Display *display, const void *source); /* 121 */
-#endif /* AQUA */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    void (*reserved122)(void);
-#endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    void (*reserved122)(void);
-#endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    void (*reserved122)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkpDefineNativeBitmaps) (void); /* 122 */
-#endif /* AQUA */
     void (*reserved123)(void);
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    void (*reserved124)(void);
-#endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    void (*reserved124)(void);
-#endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    void (*reserved124)(void); /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpGetNativeAppBitmap) (Display *display, const char *name, int *width, int *height); /* 124 */
-#endif /* AQUA */
     void (*reserved125)(void);
     void (*reserved126)(void);
     void (*reserved127)(void);
@@ -739,7 +683,7 @@ typedef struct TkIntStubs {
     void (*reserved132)(void);
     void (*reserved133)(void);
     void (*reserved134)(void);
-    TCL_DEPRECATED_API("renamed to Tk_DrawHighlightBorder") void (*tkpDrawHighlightBorder) (Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable); /* 135 */
+    void (*reserved135)(void);
     void (*tkSetFocusWin) (TkWindow *winPtr, int force); /* 136 */
     void (*tkpSetKeycodeAndState) (Tk_Window tkwin, KeySym keySym, XEvent *eventPtr); /* 137 */
     KeySym (*tkpGetKeySym) (TkDisplay *dispPtr, XEvent *eventPtr); /* 138 */
@@ -923,20 +867,17 @@ extern const TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkpDisplayWarning) /* 58 */
 #define TkpGetAppName \
 	(tkIntStubsPtr->tkpGetAppName) /* 59 */
-#define TkpGetOtherWindow \
-	(tkIntStubsPtr->tkpGetOtherWindow) /* 60 */
+/* Slot 60 is reserved */
 #define TkpGetWrapperWindow \
 	(tkIntStubsPtr->tkpGetWrapperWindow) /* 61 */
 #define TkpInit \
 	(tkIntStubsPtr->tkpInit) /* 62 */
 #define TkpInitializeMenuBindings \
 	(tkIntStubsPtr->tkpInitializeMenuBindings) /* 63 */
-#define TkpMakeContainer \
-	(tkIntStubsPtr->tkpMakeContainer) /* 64 */
+/* Slot 64 is reserved */
 #define TkpMakeMenuWindow \
 	(tkIntStubsPtr->tkpMakeMenuWindow) /* 65 */
-#define TkpMakeWindow \
-	(tkIntStubsPtr->tkpMakeWindow) /* 66 */
+/* Slot 66 is reserved */
 #define TkpMenuNotifyToplevelCreate \
 	(tkIntStubsPtr->tkpMenuNotifyToplevelCreate) /* 67 */
 #define TkpOpenDisplay \
@@ -951,10 +892,8 @@ extern const TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkPositionInTree) /* 72 */
 #define TkpRedirectKeyEvent \
 	(tkIntStubsPtr->tkpRedirectKeyEvent) /* 73 */
-#define TkpSetMainMenubar \
-	(tkIntStubsPtr->tkpSetMainMenubar) /* 74 */
-#define TkpUseWindow \
-	(tkIntStubsPtr->tkpUseWindow) /* 75 */
+/* Slot 74 is reserved */
+/* Slot 75 is reserved */
 /* Slot 76 is reserved */
 #define TkQueueEventForAllChildren \
 	(tkIntStubsPtr->tkQueueEventForAllChildren) /* 77 */
@@ -971,8 +910,7 @@ extern const TkIntStubs *tkIntStubsPtr;
 #define TkSelPropProc \
 	(tkIntStubsPtr->tkSelPropProc) /* 83 */
 /* Slot 84 is reserved */
-#define TkSetWindowMenuBar \
-	(tkIntStubsPtr->tkSetWindowMenuBar) /* 85 */
+/* Slot 85 is reserved */
 #define TkStringToKeysym \
 	(tkIntStubsPtr->tkStringToKeysym) /* 86 */
 #define TkThickPolyLineToArea \
@@ -1023,8 +961,7 @@ extern const TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkpGetString) /* 109 */
 #define TkpGetSubFonts \
 	(tkIntStubsPtr->tkpGetSubFonts) /* 110 */
-#define TkpGetSystemDefault \
-	(tkIntStubsPtr->tkpGetSystemDefault) /* 111 */
+/* Slot 111 is reserved */
 #define TkpMenuThreadInit \
 	(tkIntStubsPtr->tkpMenuThreadInit) /* 112 */
 #define XClipBox \
@@ -1042,19 +979,13 @@ extern const TkIntStubs *tkIntStubsPtr;
 #define XUnionRectWithRegion \
 	(tkIntStubsPtr->xUnionRectWithRegion) /* 119 */
 /* Slot 120 is reserved */
-#ifdef MAC_OSX_TK /* AQUA */
 #define TkpCreateNativeBitmap \
 	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
-#endif /* AQUA */
-#ifdef MAC_OSX_TK /* AQUA */
 #define TkpDefineNativeBitmaps \
 	(tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */
-#endif /* AQUA */
 /* Slot 123 is reserved */
-#ifdef MAC_OSX_TK /* AQUA */
 #define TkpGetNativeAppBitmap \
 	(tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */
-#endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
 /* Slot 127 is reserved */
@@ -1065,8 +996,7 @@ extern const TkIntStubs *tkIntStubsPtr;
 /* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
-#define TkpDrawHighlightBorder \
-	(tkIntStubsPtr->tkpDrawHighlightBorder) /* 135 */
+/* Slot 135 is reserved */
 #define TkSetFocusWin \
 	(tkIntStubsPtr->tkSetFocusWin) /* 136 */
 #define TkpSetKeycodeAndState \
@@ -1178,39 +1108,17 @@ extern const TkIntStubs *tkIntStubsPtr;
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-#undef TkpCmapStressed_
-#undef TkpSync_
-#undef TkUnixContainerId_
-#undef TkUnixDoOneXEvent_
-#undef TkUnixSetMenubar_
-#undef TkWmCleanup_
-#undef TkSendCleanup_
-#undef TkpTestsendCmd_
-#undef TkSetWindowMenuBar
-#undef TkpDrawHighlightBorder
-#undef TkpUseWindow
-#undef TkpSetMainMenubar
-#undef TkpGetOtherWindow
-#undef TkpGetSystemDefault
-#undef TkpMakeContainer
-#undef TkpMakeWindow
-
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION == 8)
-#   define TkSetWindowMenuBar Tk_SetWindowMenubar
-#   define TkpDrawHighlightBorder Tk_DrawHighlightBorder
-#   define TkpUseWindow Tk_UseWindow
-#   define TkpSetMainMenubar Tk_SetMainMenubar
-#   define TkpGetOtherWindow ((TkWindow *(*)(TkWindow *))(void *)Tk_GetOtherWindow)
-#   define TkpGetSystemDefault Tk_GetSystemDefault
-#   define TkpMakeContainer Tk_MakeContainer
-#   define TkpMakeWindow ((Window (*)(TkWindow *, Window))(void *)Tk_MakeWindow)
-#endif
-
 #if !defined(MAC_OSX_TK) && !defined(USE_TK_STUBS)
 #   undef TkpWillDrawWidget
 #   undef TkpRedrawWidget
+#   undef TkpDefineNativeBitmaps
+#   undef TkpCreateNativeBitmap
+#   undef TkpGetNativeAppBitmap
 #   define TkpWillDrawWidget(w) 0
 #   define TkpRedrawWidget(w)
+#   define TkpDefineNativeBitmaps()
+#   define TkpCreateNativeBitmap(display, source) None
+#   define TkpGetNativeAppBitmap(display, name, w, h) None
 #endif
 
 #endif /* _TKINTDECLS */
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index c3164da..e470575 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -36,8 +36,7 @@ extern "C" {
 
 #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
 /* 0 */
-EXTERN char *		TkAlignImageData(XImage *image, int alignment,
-				int bitOrder);
+EXTERN void		TkCreateXEventSource(void);
 /* Slot 1 is reserved */
 /* 2 */
 EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
@@ -114,7 +113,8 @@ EXTERN void		TkWinDialogDebug(int debug);
 EXTERN Tcl_Obj *	TkWinGetMenuSystemDefault(Tk_Window tkwin,
 				const char *dbName, const char *className);
 /* 33 */
-EXTERN int		TkWinGetPlatformId(void);
+EXTERN char *		TkAlignImageData(XImage *image, int alignment,
+				int bitOrder);
 /* 34 */
 EXTERN void		TkWinSetHINSTANCE(HINSTANCE hInstance);
 /* 35 */
@@ -122,8 +122,7 @@ EXTERN int		TkWinGetPlatformTheme(void);
 /* 36 */
 EXTERN LRESULT __stdcall TkWinChildProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam);
-/* 37 */
-EXTERN void		TkCreateXEventSource(void);
+/* Slot 37 is reserved */
 /* 38 */
 EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
 /* 39 */
@@ -146,30 +145,31 @@ EXTERN int		TkpTestsendCmd(void *clientData, Tcl_Interp *interp,
 EXTERN Tk_Window	TkpGetCapture(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-/* 0 */
-EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
-				int active);
-/* Slot 1 is reserved */
+/* Slot 0 is reserved */
+/* 1 */
+EXTERN void		TkAboutDlg(void);
 /* 2 */
-EXTERN void		TkGenerateActivateEvents_(TkWindow *winPtr,
+EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
 				int active);
 /* 3 */
-EXTERN void		TkPointerDeadWindow(TkWindow *winPtr);
+EXTERN unsigned long	TkpGetMS(void);
 /* 4 */
-EXTERN void		TkpSetCapture(TkWindow *winPtr);
+EXTERN void		TkPointerDeadWindow(TkWindow *winPtr);
 /* 5 */
 EXTERN void		TkpSetCursor(TkpCursor cursor);
 /* 6 */
-EXTERN void		TkpWmSetState(TkWindow *winPtr, int state);
+EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
+				const char *string, Window *idPtr);
 /* 7 */
-EXTERN void		TkAboutDlg(void);
+EXTERN int		TkpWmSetState(TkWindow *winPtr, int state);
 /* 8 */
 EXTERN unsigned int	TkMacOSXButtonKeyState(void);
 /* 9 */
 EXTERN void		TkMacOSXClearMenubarActive(void);
 /* 10 */
 EXTERN int		TkMacOSXDispatchMenuEvent(int menuID, int index);
-/* Slot 11 is reserved */
+/* 11 */
+EXTERN void		TkpSetCapture(TkWindow *winPtr);
 /* 12 */
 EXTERN void		TkMacOSXHandleTearoffMenu(void);
 /* Slot 13 is reserved */
@@ -188,9 +188,7 @@ EXTERN void		TkMacOSXHandleMenuSelect(short theMenu,
 /* 21 */
 EXTERN void		TkMacOSXInvalidateWindow(MacDrawable *macWin,
 				int flag);
-/* 22 */
-EXTERN int		TkMacOSXIsCharacterMissing(Tk_Font tkfont,
-				unsigned int searchChar);
+/* Slot 22 is reserved */
 /* 23 */
 EXTERN void		TkMacOSXMakeRealWindowExist(TkWindow *winPtr);
 /* 24 */
@@ -204,8 +202,7 @@ EXTERN int		TkMacOSXResizable(TkWindow *winPtr);
 EXTERN void		TkMacOSXSetHelpMenuItemCount(void);
 /* 29 */
 EXTERN void		TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag);
-/* 30 */
-EXTERN void		TkMacOSXSetUpClippingRgn(Drawable drawable);
+/* Slot 30 is reserved */
 /* 31 */
 EXTERN void		TkMacOSXSetUpGraphicsPort(GC gc, void *destPort);
 /* 32 */
@@ -251,13 +248,9 @@ EXTERN int		TkGenerateButtonEvent(int x, int y, Window window,
 EXTERN void		TkGenWMDestroyEvent(Tk_Window tkwin);
 /* 52 */
 EXTERN void		TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag);
-/* 53 */
-EXTERN unsigned long	TkpGetMS(void);
+/* Slot 53 is reserved */
 /* 54 */
 EXTERN void *		TkMacOSXDrawable(Drawable drawable);
-/* 55 */
-EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
-				const char *string, Window *idPtr);
 #endif /* AQUA */
 #if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
 /* 0 */
@@ -266,29 +259,20 @@ EXTERN void		TkCreateXEventSource(void);
 /* 2 */
 EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
 				int active);
-/* 3 */
-EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
-/* 4 */
-EXTERN void		TkpSync(Display *display);
-/* 5 */
-EXTERN Window		TkUnixContainerId(TkWindow *winPtr);
+/* Slot 3 is reserved */
+/* Slot 4 is reserved */
+/* Slot 5 is reserved */
 /* 6 */
-EXTERN int		TkUnixDoOneXEvent(Tcl_Time *timePtr);
-/* 7 */
-EXTERN void		TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar);
-/* 8 */
 EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
 				const char *string, Window *idPtr);
+/* Slot 7 is reserved */
+/* Slot 8 is reserved */
 /* 9 */
-EXTERN void		TkWmCleanup(TkDisplay *dispPtr);
-/* 10 */
-EXTERN void		TkSendCleanup(TkDisplay *dispPtr);
-/* Slot 11 is reserved */
-/* 12 */
 EXTERN int		TkpWmSetState(TkWindow *winPtr, int state);
-/* 13 */
-EXTERN int		TkpTestsendCmd_(void *clientData, Tcl_Interp *interp,
-				Tcl_Size objc, Tcl_Obj *const objv[]);
+/* Slot 10 is reserved */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
 /* Slot 16 is reserved */
@@ -314,19 +298,19 @@ EXTERN int		TkpTestsendCmd_(void *clientData, Tcl_Interp *interp,
 /* Slot 36 is reserved */
 /* Slot 37 is reserved */
 /* 38 */
-EXTERN int		TkpCmapStressed_(Tk_Window tkwin, Colormap colormap);
+EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
 /* 39 */
-EXTERN void		TkpSync_(Display *display);
+EXTERN void		TkpSync(Display *display);
 /* 40 */
-EXTERN Window		TkUnixContainerId_(TkWindow *winPtr);
+EXTERN Window		TkUnixContainerId(TkWindow *winPtr);
 /* 41 */
-EXTERN int		TkUnixDoOneXEvent_(Tcl_Time *timePtr);
+EXTERN int		TkUnixDoOneXEvent(Tcl_Time *timePtr);
 /* 42 */
-EXTERN void		TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar);
+EXTERN void		TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar);
 /* 43 */
-EXTERN void		TkWmCleanup_(TkDisplay *dispPtr);
+EXTERN void		TkWmCleanup(TkDisplay *dispPtr);
 /* 44 */
-EXTERN void		TkSendCleanup_(TkDisplay *dispPtr);
+EXTERN void		TkSendCleanup(TkDisplay *dispPtr);
 /* 45 */
 EXTERN int		TkpTestsendCmd(void *clientData, Tcl_Interp *interp,
 				Tcl_Size objc, Tcl_Obj *const objv[]);
@@ -337,7 +321,7 @@ typedef struct TkIntPlatStubs {
     void *hooks;
 
 #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
-    char * (*tkAlignImageData) (XImage *image, int alignment, int bitOrder); /* 0 */
+    void (*tkCreateXEventSource) (void); /* 0 */
     void (*reserved1)(void);
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
     unsigned long (*tkpGetMS) (void); /* 3 */
@@ -370,11 +354,11 @@ typedef struct TkIntPlatStubs {
     void (*tkWinSetForegroundWindow) (TkWindow *winPtr); /* 30 */
     void (*tkWinDialogDebug) (int debug); /* 31 */
     Tcl_Obj * (*tkWinGetMenuSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 32 */
-    int (*tkWinGetPlatformId) (void); /* 33 */
+    char * (*tkAlignImageData) (XImage *image, int alignment, int bitOrder); /* 33 */
     void (*tkWinSetHINSTANCE) (HINSTANCE hInstance); /* 34 */
     int (*tkWinGetPlatformTheme) (void); /* 35 */
     LRESULT (__stdcall *tkWinChildProc) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); /* 36 */
-    void (*tkCreateXEventSource) (void); /* 37 */
+    void (*reserved37)(void);
     int (*tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); /* 38 */
     void (*tkpSync) (Display *display); /* 39 */
     Window (*tkUnixContainerId) (TkWindow *winPtr); /* 40 */
@@ -387,18 +371,18 @@ typedef struct TkIntPlatStubs {
     Tk_Window (*tkpGetCapture) (void); /* 47 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */
-    void (*reserved1)(void);
-    void (*tkGenerateActivateEvents_) (TkWindow *winPtr, int active); /* 2 */
-    void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 3 */
-    void (*tkpSetCapture) (TkWindow *winPtr); /* 4 */
+    void (*reserved0)(void);
+    void (*tkAboutDlg) (void); /* 1 */
+    void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
+    unsigned long (*tkpGetMS) (void); /* 3 */
+    void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 4 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 5 */
-    void (*tkpWmSetState) (TkWindow *winPtr, int state); /* 6 */
-    void (*tkAboutDlg) (void); /* 7 */
+    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 6 */
+    int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 7 */
     unsigned int (*tkMacOSXButtonKeyState) (void); /* 8 */
     void (*tkMacOSXClearMenubarActive) (void); /* 9 */
     int (*tkMacOSXDispatchMenuEvent) (int menuID, int index); /* 10 */
-    void (*reserved11)(void);
+    void (*tkpSetCapture) (TkWindow *winPtr); /* 11 */
     void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
     void (*reserved13)(void);
     int (*tkMacOSXDoHLEvent) (void *theEvent); /* 14 */
@@ -409,7 +393,7 @@ typedef struct TkIntPlatStubs {
     void (*reserved19)(void);
     void (*reserved20)(void);
     void (*tkMacOSXInvalidateWindow) (MacDrawable *macWin, int flag); /* 21 */
-    int (*tkMacOSXIsCharacterMissing) (Tk_Font tkfont, unsigned int searchChar); /* 22 */
+    void (*reserved22)(void);
     void (*tkMacOSXMakeRealWindowExist) (TkWindow *winPtr); /* 23 */
     void * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
     void (*tkMacOSXMenuClick) (void); /* 25 */
@@ -417,7 +401,7 @@ typedef struct TkIntPlatStubs {
     int (*tkMacOSXResizable) (TkWindow *winPtr); /* 27 */
     void (*tkMacOSXSetHelpMenuItemCount) (void); /* 28 */
     void (*tkMacOSXSetScrollbarGrow) (TkWindow *winPtr, int flag); /* 29 */
-    void (*tkMacOSXSetUpClippingRgn) (Drawable drawable); /* 30 */
+    void (*reserved30)(void);
     void (*tkMacOSXSetUpGraphicsPort) (GC gc, void *destPort); /* 31 */
     void (*tkMacOSXUpdateClipRgn) (TkWindow *winPtr); /* 32 */
     void (*reserved33)(void);
@@ -440,25 +424,24 @@ typedef struct TkIntPlatStubs {
     int (*tkGenerateButtonEvent) (int x, int y, Window window, unsigned int state); /* 50 */
     void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */
     void (*tkMacOSXSetDrawingEnabled) (TkWindow *winPtr, int flag); /* 52 */
-    unsigned long (*tkpGetMS) (void); /* 53 */
+    void (*reserved53)(void);
     void * (*tkMacOSXDrawable) (Drawable drawable); /* 54 */
-    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 55 */
 #endif /* AQUA */
 #if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) (void); /* 0 */
     void (*reserved1)(void);
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
-    int (*tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); /* 3 */
-    void (*tkpSync) (Display *display); /* 4 */
-    Window (*tkUnixContainerId) (TkWindow *winPtr); /* 5 */
-    int (*tkUnixDoOneXEvent) (Tcl_Time *timePtr); /* 6 */
-    void (*tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); /* 7 */
-    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 8 */
-    void (*tkWmCleanup) (TkDisplay *dispPtr); /* 9 */
-    void (*tkSendCleanup) (TkDisplay *dispPtr); /* 10 */
+    void (*reserved3)(void);
+    void (*reserved4)(void);
+    void (*reserved5)(void);
+    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 6 */
+    void (*reserved7)(void);
+    void (*reserved8)(void);
+    int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 9 */
+    void (*reserved10)(void);
     void (*reserved11)(void);
-    int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 12 */
-    int (*tkpTestsendCmd_) (void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); /* 13 */
+    void (*reserved12)(void);
+    void (*reserved13)(void);
     void (*reserved14)(void);
     void (*reserved15)(void);
     void (*reserved16)(void);
@@ -483,13 +466,13 @@ typedef struct TkIntPlatStubs {
     void (*reserved35)(void);
     void (*reserved36)(void);
     void (*reserved37)(void);
-    int (*tkpCmapStressed_) (Tk_Window tkwin, Colormap colormap); /* 38 */
-    void (*tkpSync_) (Display *display); /* 39 */
-    Window (*tkUnixContainerId_) (TkWindow *winPtr); /* 40 */
-    int (*tkUnixDoOneXEvent_) (Tcl_Time *timePtr); /* 41 */
-    void (*tkUnixSetMenubar_) (Tk_Window tkwin, Tk_Window menubar); /* 42 */
-    void (*tkWmCleanup_) (TkDisplay *dispPtr); /* 43 */
-    void (*tkSendCleanup_) (TkDisplay *dispPtr); /* 44 */
+    int (*tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); /* 38 */
+    void (*tkpSync) (Display *display); /* 39 */
+    Window (*tkUnixContainerId) (TkWindow *winPtr); /* 40 */
+    int (*tkUnixDoOneXEvent) (Tcl_Time *timePtr); /* 41 */
+    void (*tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); /* 42 */
+    void (*tkWmCleanup) (TkDisplay *dispPtr); /* 43 */
+    void (*tkSendCleanup) (TkDisplay *dispPtr); /* 44 */
     int (*tkpTestsendCmd) (void *clientData, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]); /* 45 */
 #endif /* X11 */
 } TkIntPlatStubs;
@@ -507,8 +490,8 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
  */
 
 #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
-#define TkAlignImageData \
-	(tkIntPlatStubsPtr->tkAlignImageData) /* 0 */
+#define TkCreateXEventSource \
+	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
 /* Slot 1 is reserved */
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
@@ -572,16 +555,15 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkWinDialogDebug) /* 31 */
 #define TkWinGetMenuSystemDefault \
 	(tkIntPlatStubsPtr->tkWinGetMenuSystemDefault) /* 32 */
-#define TkWinGetPlatformId \
-	(tkIntPlatStubsPtr->tkWinGetPlatformId) /* 33 */
+#define TkAlignImageData \
+	(tkIntPlatStubsPtr->tkAlignImageData) /* 33 */
 #define TkWinSetHINSTANCE \
 	(tkIntPlatStubsPtr->tkWinSetHINSTANCE) /* 34 */
 #define TkWinGetPlatformTheme \
 	(tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */
 #define TkWinChildProc \
 	(tkIntPlatStubsPtr->tkWinChildProc) /* 36 */
-#define TkCreateXEventSource \
-	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 37 */
+/* Slot 37 is reserved */
 #define TkpCmapStressed \
 	(tkIntPlatStubsPtr->tkpCmapStressed) /* 38 */
 #define TkpSync \
@@ -603,28 +585,29 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkpGetCapture) /* 47 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
+/* Slot 0 is reserved */
+#define TkAboutDlg \
+	(tkIntPlatStubsPtr->tkAboutDlg) /* 1 */
 #define TkGenerateActivateEvents \
-	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
-/* Slot 1 is reserved */
-#define TkGenerateActivateEvents_ \
-	(tkIntPlatStubsPtr->tkGenerateActivateEvents_) /* 2 */
+	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
+#define TkpGetMS \
+	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
 #define TkPointerDeadWindow \
-	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 3 */
-#define TkpSetCapture \
-	(tkIntPlatStubsPtr->tkpSetCapture) /* 4 */
+	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 4 */
 #define TkpSetCursor \
 	(tkIntPlatStubsPtr->tkpSetCursor) /* 5 */
+#define TkpScanWindowId \
+	(tkIntPlatStubsPtr->tkpScanWindowId) /* 6 */
 #define TkpWmSetState \
-	(tkIntPlatStubsPtr->tkpWmSetState) /* 6 */
-#define TkAboutDlg \
-	(tkIntPlatStubsPtr->tkAboutDlg) /* 7 */
+	(tkIntPlatStubsPtr->tkpWmSetState) /* 7 */
 #define TkMacOSXButtonKeyState \
 	(tkIntPlatStubsPtr->tkMacOSXButtonKeyState) /* 8 */
 #define TkMacOSXClearMenubarActive \
 	(tkIntPlatStubsPtr->tkMacOSXClearMenubarActive) /* 9 */
 #define TkMacOSXDispatchMenuEvent \
 	(tkIntPlatStubsPtr->tkMacOSXDispatchMenuEvent) /* 10 */
-/* Slot 11 is reserved */
+#define TkpSetCapture \
+	(tkIntPlatStubsPtr->tkpSetCapture) /* 11 */
 #define TkMacOSXHandleTearoffMenu \
 	(tkIntPlatStubsPtr->tkMacOSXHandleTearoffMenu) /* 12 */
 /* Slot 13 is reserved */
@@ -641,8 +624,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 /* Slot 20 is reserved */
 #define TkMacOSXInvalidateWindow \
 	(tkIntPlatStubsPtr->tkMacOSXInvalidateWindow) /* 21 */
-#define TkMacOSXIsCharacterMissing \
-	(tkIntPlatStubsPtr->tkMacOSXIsCharacterMissing) /* 22 */
+/* Slot 22 is reserved */
 #define TkMacOSXMakeRealWindowExist \
 	(tkIntPlatStubsPtr->tkMacOSXMakeRealWindowExist) /* 23 */
 #define TkMacOSXMakeStippleMap \
@@ -656,8 +638,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkMacOSXSetHelpMenuItemCount) /* 28 */
 #define TkMacOSXSetScrollbarGrow \
 	(tkIntPlatStubsPtr->tkMacOSXSetScrollbarGrow) /* 29 */
-#define TkMacOSXSetUpClippingRgn \
-	(tkIntPlatStubsPtr->tkMacOSXSetUpClippingRgn) /* 30 */
+/* Slot 30 is reserved */
 #define TkMacOSXSetUpGraphicsPort \
 	(tkIntPlatStubsPtr->tkMacOSXSetUpGraphicsPort) /* 31 */
 #define TkMacOSXUpdateClipRgn \
@@ -699,12 +680,9 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 51 */
 #define TkMacOSXSetDrawingEnabled \
 	(tkIntPlatStubsPtr->tkMacOSXSetDrawingEnabled) /* 52 */
-#define TkpGetMS \
-	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
+/* Slot 53 is reserved */
 #define TkMacOSXDrawable \
 	(tkIntPlatStubsPtr->tkMacOSXDrawable) /* 54 */
-#define TkpScanWindowId \
-	(tkIntPlatStubsPtr->tkpScanWindowId) /* 55 */
 #endif /* AQUA */
 #if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
 #define TkCreateXEventSource \
@@ -712,27 +690,19 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 /* Slot 1 is reserved */
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
-#define TkpCmapStressed \
-	(tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */
-#define TkpSync \
-	(tkIntPlatStubsPtr->tkpSync) /* 4 */
-#define TkUnixContainerId \
-	(tkIntPlatStubsPtr->tkUnixContainerId) /* 5 */
-#define TkUnixDoOneXEvent \
-	(tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 6 */
-#define TkUnixSetMenubar \
-	(tkIntPlatStubsPtr->tkUnixSetMenubar) /* 7 */
+/* Slot 3 is reserved */
+/* Slot 4 is reserved */
+/* Slot 5 is reserved */
 #define TkpScanWindowId \
-	(tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */
-#define TkWmCleanup \
-	(tkIntPlatStubsPtr->tkWmCleanup) /* 9 */
-#define TkSendCleanup \
-	(tkIntPlatStubsPtr->tkSendCleanup) /* 10 */
-/* Slot 11 is reserved */
+	(tkIntPlatStubsPtr->tkpScanWindowId) /* 6 */
+/* Slot 7 is reserved */
+/* Slot 8 is reserved */
 #define TkpWmSetState \
-	(tkIntPlatStubsPtr->tkpWmSetState) /* 12 */
-#define TkpTestsendCmd_ \
-	(tkIntPlatStubsPtr->tkpTestsendCmd_) /* 13 */
+	(tkIntPlatStubsPtr->tkpWmSetState) /* 9 */
+/* Slot 10 is reserved */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
 /* Slot 16 is reserved */
@@ -757,20 +727,20 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 /* Slot 35 is reserved */
 /* Slot 36 is reserved */
 /* Slot 37 is reserved */
-#define TkpCmapStressed_ \
-	(tkIntPlatStubsPtr->tkpCmapStressed_) /* 38 */
-#define TkpSync_ \
-	(tkIntPlatStubsPtr->tkpSync_) /* 39 */
-#define TkUnixContainerId_ \
-	(tkIntPlatStubsPtr->tkUnixContainerId_) /* 40 */
-#define TkUnixDoOneXEvent_ \
-	(tkIntPlatStubsPtr->tkUnixDoOneXEvent_) /* 41 */
-#define TkUnixSetMenubar_ \
-	(tkIntPlatStubsPtr->tkUnixSetMenubar_) /* 42 */
-#define TkWmCleanup_ \
-	(tkIntPlatStubsPtr->tkWmCleanup_) /* 43 */
-#define TkSendCleanup_ \
-	(tkIntPlatStubsPtr->tkSendCleanup_) /* 44 */
+#define TkpCmapStressed \
+	(tkIntPlatStubsPtr->tkpCmapStressed) /* 38 */
+#define TkpSync \
+	(tkIntPlatStubsPtr->tkpSync) /* 39 */
+#define TkUnixContainerId \
+	(tkIntPlatStubsPtr->tkUnixContainerId) /* 40 */
+#define TkUnixDoOneXEvent \
+	(tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 41 */
+#define TkUnixSetMenubar \
+	(tkIntPlatStubsPtr->tkUnixSetMenubar) /* 42 */
+#define TkWmCleanup \
+	(tkIntPlatStubsPtr->tkWmCleanup) /* 43 */
+#define TkSendCleanup \
+	(tkIntPlatStubsPtr->tkSendCleanup) /* 44 */
 #define TkpTestsendCmd \
 	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 45 */
 #endif /* X11 */
@@ -779,23 +749,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef TkpCmapStressed_
-#undef TkpSync_
-#undef TkUnixContainerId_
-#undef TkUnixDoOneXEvent_
-#undef TkUnixSetMenubar_
-#undef TkWmCleanup_
-#undef TkSendCleanup_
-#undef TkpTestsendCmd_
-#undef TkGenerateActivateEvents_
-#undef TkMacOSXSetUpClippingRgn
-#undef TkMacOSXIsCharacterMissing
-#define TkMacOSXIsCharacterMissing(tkfont) ((void)tkfont, 0)
-
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-#undef TkWinGetPlatformId
-#define TkWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */
-
 #endif /* _TKINTPLATDECLS */
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 360594a..2f56d80 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -498,284 +498,283 @@ EXTERN char *		XKeysymToString(KeySym k);
 EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
 /* 7 */
-EXTERN GContext		XGContextFromGC(GC g);
+EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+				XColor *x1, XColor *x2, unsigned int ui1,
+				unsigned int ui2);
 /* 8 */
-EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
+EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
+				unsigned int ui1, unsigned int ui2,
+				XColor _Xconst *x1, XColor _Xconst *x2);
 /* 9 */
-EXTERN KeySym		XStringToKeysym(_Xconst char *c);
+EXTERN GContext		XGContextFromGC(GC g);
 /* 10 */
-EXTERN Window		XRootWindow(Display *d, int i);
+EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
 /* 11 */
-EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
 /* 12 */
-EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+EXTERN KeySym		XStringToKeysym(_Xconst char *c);
 /* 13 */
-EXTERN int		XBell(Display *d, int i);
+EXTERN Window		XRootWindow(Display *d, int i);
 /* 14 */
+EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+/* 15 */
+EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
+/* 16 */
+EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
+/* 17 */
+EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
+				Window **wpp, int *ip);
+/* 18 */
+EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+/* 19 */
+EXTERN int		XBell(Display *d, int i);
+/* 20 */
 EXTERN int		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
 				_Xconst unsigned char *c, int i3);
-/* 15 */
+/* 21 */
 EXTERN int		XChangeWindowAttributes(Display *d, Window w,
 				unsigned long ul, XSetWindowAttributes *x);
-/* 16 */
+/* 22 */
+EXTERN int		XClearWindow(Display *d, Window w);
+/* 23 */
 EXTERN int		XConfigureWindow(Display *d, Window w,
 				unsigned int i, XWindowChanges *x);
-/* 17 */
+/* 24 */
 EXTERN int		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
-/* 18 */
+/* 25 */
 EXTERN int		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);
-/* 19 */
+/* 26 */
 EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
 				_Xconst char *data, unsigned int width,
 				unsigned int height);
-/* 20 */
+/* 27 */
 EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
-/* 21 */
+/* 28 */
+EXTERN int		XDeleteProperty(Display *d, Window w, Atom a);
+/* 29 */
 EXTERN int		XDestroyWindow(Display *d, Window w);
-/* 22 */
+/* 30 */
 EXTERN int		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-/* 23 */
+/* 31 */
 EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
 				int i1, int i2);
-/* 24 */
+/* 32 */
 EXTERN int		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-/* 25 */
+/* 33 */
 EXTERN int		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-/* 26 */
+/* 34 */
 EXTERN int		XFillPolygon(Display *d, Drawable dr, GC g,
 				XPoint *x, int i1, int i2, int i3);
-/* 27 */
+/* 35 */
 EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
 				XRectangle *x, int i);
-/* 28 */
+/* 36 */
+EXTERN int		XForceScreenSaver(Display *d, int i);
+/* 37 */
 EXTERN int		XFreeColormap(Display *d, Colormap c);
-/* 29 */
+/* 38 */
 EXTERN int		XFreeColors(Display *d, Colormap c,
 				unsigned long *ulp, int i, unsigned long ul);
-/* 30 */
+/* 39 */
+EXTERN int		XFreeCursor(Display *d, Cursor c);
+/* 40 */
 EXTERN int		XFreeModifiermap(XModifierKeymap *x);
-/* 31 */
+/* 41 */
 EXTERN Status		XGetGeometry(Display *d, Drawable dr, Window *w,
 				int *i1, int *i2, unsigned int *ui1,
 				unsigned int *ui2, unsigned int *ui3,
 				unsigned int *ui4);
-/* 32 */
+/* 42 */
+EXTERN int		XGetInputFocus(Display *d, Window *w, int *i);
+/* 43 */
 EXTERN 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);
-/* 33 */
+/* 44 */
+EXTERN Status		XGetWindowAttributes(Display *d, Window w,
+				XWindowAttributes *x);
+/* 45 */
 EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
-/* 34 */
+/* 46 */
 EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
-/* 35 */
+/* 47 */
 EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
-/* 36 */
+/* 48 */
+EXTERN Status		XLookupColor(Display *d, Colormap c1,
+				_Xconst char *c2, XColor *x1, XColor *x2);
+/* 49 */
 EXTERN int		XMapWindow(Display *d, Window w);
-/* 37 */
+/* 50 */
 EXTERN int		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-/* 38 */
+/* 51 */
 EXTERN int		XMoveWindow(Display *d, Window w, int i1, int i2);
-/* 39 */
+/* 52 */
+EXTERN int		XNextEvent(Display *d, XEvent *x);
+/* 53 */
+EXTERN int		XPutBackEvent(Display *d, XEvent *x);
+/* 54 */
+EXTERN int		XQueryColors(Display *d, Colormap c, XColor *x,
+				int i);
+/* 55 */
 EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
 				Window *w3, int *i1, int *i2, int *i3,
 				int *i4, unsigned int *ui);
-/* 40 */
+/* 56 */
+EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
+				Window *w3, Window **w4, unsigned int *ui);
+/* 57 */
 EXTERN int		XRaiseWindow(Display *d, Window w);
-/* 41 */
+/* 58 */
 EXTERN int		XRefreshKeyboardMapping(XMappingEvent *x);
-/* 42 */
+/* 59 */
 EXTERN int		XResizeWindow(Display *d, Window w, unsigned int ui1,
 				unsigned int ui2);
-/* 43 */
+/* 60 */
 EXTERN int		XSelectInput(Display *d, Window w, long l);
-/* 44 */
+/* 61 */
 EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
 				XEvent *x);
-/* 45 */
+/* 62 */
+EXTERN int		XSetCommand(Display *d, Window w, char **c, int i);
+/* 63 */
 EXTERN int		XSetIconName(Display *d, Window w, _Xconst char *c);
-/* 46 */
+/* 64 */
 EXTERN int		XSetInputFocus(Display *d, Window w, int i, Time t);
-/* 47 */
+/* 65 */
 EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
-/* 48 */
+/* 66 */
 EXTERN int		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
-/* 49 */
+/* 67 */
 EXTERN int		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
-/* 50 */
+/* 68 */
 EXTERN int		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
-/* 51 */
+/* 69 */
 EXTERN int		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
-/* 52 */
+/* 70 */
 EXTERN int		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
-/* 53 */
+/* 71 */
 EXTERN int		XSetWindowColormap(Display *d, Window w, Colormap c);
-/* 54 */
+/* 72 */
+EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
+				Window w2, int i1, int i2, int *i3, int *i4,
+				Window *w3);
+/* 73 */
 EXTERN int		XUngrabKeyboard(Display *d, Time t);
-/* 55 */
+/* 74 */
 EXTERN int		XUngrabPointer(Display *d, Time t);
-/* 56 */
+/* 75 */
 EXTERN int		XUnmapWindow(Display *d, Window w);
-/* 57 */
+/* 76 */
+EXTERN int		XWindowEvent(Display *d, Window w, long l, XEvent *x);
+/* 77 */
+EXTERN void		XDestroyIC(XIC x);
+/* 78 */
+EXTERN Bool		XFilterEvent(XEvent *x, Window w);
+/* 79 */
+EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
+				char *c, int i, KeySym *k, Status *s);
+/* 80 */
 EXTERN int		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);
-/* 58 */
+/* 81 */
+EXTERN int		XSetClipRectangles(Display *display, GC gc,
+				int clip_x_origin, int clip_y_origin,
+				XRectangle rectangles[], int n, int ordering);
+/* 82 */
 EXTERN Status		XParseColor(Display *display, Colormap map,
 				_Xconst char *spec, XColor *colorPtr);
-/* 59 */
+/* 83 */
 EXTERN GC		XCreateGC(Display *display, Drawable d,
 				unsigned long valuemask, XGCValues *values);
-/* 60 */
+/* 84 */
 EXTERN int		XFreeGC(Display *display, GC gc);
-/* 61 */
+/* 85 */
 EXTERN Atom		XInternAtom(Display *display,
 				_Xconst char *atom_name, Bool only_if_exists);
-/* 62 */
+/* 86 */
 EXTERN int		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
-/* 63 */
+/* 87 */
 EXTERN int		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
-/* 64 */
+/* 88 */
 EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
-/* 65 */
+/* 89 */
 EXTERN int		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
-/* 66 */
+/* 90 */
 EXTERN int		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
-/* 67 */
+/* 91 */
 EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
 				XGCValues *values);
-/* 68 */
+/* 92 */
 EXTERN int		XSetFont(Display *display, GC gc, Font font);
-/* 69 */
+/* 93 */
 EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
-/* 70 */
+/* 94 */
 EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
-/* 71 */
+/* 95 */
 EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
-/* 72 */
+/* 96 */
 EXTERN int		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
-/* 73 */
+/* 97 */
 EXTERN int		XSetFunction(Display *display, GC gc, int function);
-/* 74 */
+/* 98 */
 EXTERN int		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
-/* 75 */
+/* 99 */
 EXTERN int		_XInitImageFuncPtrs(XImage *image);
-/* 76 */
+/* 100 */
 EXTERN XIC		XCreateIC(XIM xim, ...);
-/* 77 */
+/* 101 */
 EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
 				XVisualInfo *vinfo_template,
 				int *nitems_return);
-/* 78 */
+/* 102 */
 EXTERN void		XSetWMClientMachine(Display *display, Window w,
 				XTextProperty *text_prop);
-/* 79 */
+/* 103 */
 EXTERN Status		XStringListToTextProperty(char **list, int count,
 				XTextProperty *text_prop_return);
-/* 80 */
-EXTERN int		XDrawSegments(Display *display, Drawable d, GC gc,
-				XSegment *segments, int nsegments);
-/* 81 */
-EXTERN int		XForceScreenSaver(Display *display, int mode);
-/* 82 */
+/* 104 */
 EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
-/* 83 */
+/* 105 */
+EXTERN int		XWarpPointer(Display *d, Window s, Window dw, int sx,
+				int sy, unsigned int sw, unsigned int sh,
+				int dx, int dy);
+/* 106 */
 EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
-/* 84 */
-EXTERN int		XClearWindow(Display *d, Window w);
-/* 85 */
-EXTERN int		XDrawPoint(Display *display, Drawable d, GC gc,
-				int x, int y);
-/* 86 */
-EXTERN int		XDrawPoints(Display *display, Drawable d, GC gc,
-				XPoint *points, int npoints, int mode);
-/* 87 */
-EXTERN int		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);
-/* 88 */
-EXTERN int		XQueryColor(Display *display, Colormap colormap,
-				XColor *def_in_out);
-/* 89 */
-EXTERN int		XQueryColors(Display *display, Colormap colormap,
-				XColor *defs_in_out, int ncolors);
-/* 90 */
-EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
-				Window *w3, Window **w4, unsigned int *ui);
-/* 91 */
-EXTERN int		XSync(Display *display, Bool discard);
-/* 92 */
-EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
-				Window w2, int i1, int i2, int *i3, int *i4,
-				Window *w3);
-/* 93 */
-EXTERN int		XDeleteProperty(Display *d, Window w, Atom a);
-/* 94 */
-EXTERN int		XFreeCursor(Display *d, Cursor c);
-/* 95 */
-EXTERN int		XGetInputFocus(Display *d, Window *w, int *i);
-/* 96 */
-EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
-				char *c, int i, KeySym *k, Status *s);
-/* 97 */
-EXTERN int		XNextEvent(Display *d, XEvent *x);
-/* 98 */
-EXTERN int		XPutBackEvent(Display *d, XEvent *x);
-/* 99 */
-EXTERN int		XSetCommand(Display *d, Window w, char **c, int i);
-/* 100 */
-EXTERN int		XWindowEvent(Display *d, Window w, long l, XEvent *x);
-/* 101 */
-EXTERN Status		XGetWindowAttributes(Display *d, Window w,
-				XWindowAttributes *x);
-/* 102 */
-EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
-				Window **wpp, int *ip);
-/* 103 */
-EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
-/* 104 */
-EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
-/* 105 */
-EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
-/* 106 */
-EXTERN int		XSetClipRectangles(Display *display, GC gc,
-				int clip_x_origin, int clip_y_origin,
-				XRectangle rectangles[], int n, int ordering);
 /* 107 */
 EXTERN int		XFlush(Display *display);
 /* 108 */
@@ -789,8 +788,7 @@ EXTERN int		XNoOp(Display *display);
 /* 112 */
 EXTERN XAfterFunction	XSynchronize(Display *display, Bool onoff);
 /* 113 */
-EXTERN Status		XLookupColor(Display *d, Colormap c1,
-				_Xconst char *c2, XColor *x1, XColor *x2);
+EXTERN int		XSync(Display *display, Bool discard);
 /* 114 */
 EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
 /* Slot 115 is reserved */
@@ -828,9 +826,15 @@ EXTERN int		XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a,
 /* 132 */
 EXTERN int		XDrawRectangles(Display *d, Drawable dr, GC gc,
 				XRectangle *r, int n);
-/* Slot 133 is reserved */
-/* Slot 134 is reserved */
-/* Slot 135 is reserved */
+/* 133 */
+EXTERN int		XDrawSegments(Display *d, Drawable dr, GC gc,
+				XSegment *s, int n);
+/* 134 */
+EXTERN int		XDrawPoint(Display *d, Drawable dr, GC gc, int x,
+				int y);
+/* 135 */
+EXTERN int		XDrawPoints(Display *d, Drawable dr, GC gc,
+				XPoint *p, int n, int m);
 /* 136 */
 EXTERN int		XReparentWindow(Display *d, Window w, Window p,
 				int x, int y);
@@ -850,16 +854,9 @@ EXTERN char *		XSetICValues(XIC xic, ...);
 EXTERN char *		XGetICValues(XIC xic, ...);
 /* 143 */
 EXTERN void		XSetICFocus(XIC xic);
-/* 144 */
-EXTERN void		XDestroyIC(XIC xic);
-/* 145 */
-EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
-				XColor *x1, XColor *x2, unsigned int ui1,
-				unsigned int ui2);
-/* 146 */
-EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
-				unsigned int ui1, unsigned int ui2,
-				XColor _Xconst *x1, XColor _Xconst *x2);
+/* Slot 144 is reserved */
+/* Slot 145 is reserved */
+/* Slot 146 is reserved */
 /* 147 */
 EXTERN void		XFreeFontSet(Display *display, XFontSet fontset);
 /* 148 */
@@ -1073,113 +1070,113 @@ typedef struct TkIntXlibStubs {
     char * (*xGetAtomName) (Display *d, Atom a); /* 4 */
     char * (*xKeysymToString) (KeySym k); /* 5 */
     Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */
-    GContext (*xGContextFromGC) (GC g); /* 7 */
-    KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 8 */
-    KeySym (*xStringToKeysym) (_Xconst char *c); /* 9 */
-    Window (*xRootWindow) (Display *d, int i); /* 10 */
-    XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 11 */
-    Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 12 */
-    int (*xBell) (Display *d, int i); /* 13 */
-    int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */
-    int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */
-    int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */
-    int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */
-    int (*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); /* 18 */
-    Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 19 */
-    int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */
-    int (*xDestroyWindow) (Display *d, Window w); /* 21 */
-    int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */
-    int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */
-    int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */
-    int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */
-    int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */
-    int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 27 */
-    int (*xFreeColormap) (Display *d, Colormap c); /* 28 */
-    int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 29 */
-    int (*xFreeModifiermap) (XModifierKeymap *x); /* 30 */
-    Status (*xGetGeometry) (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) (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) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 33 */
-    int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 34 */
-    KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 35 */
-    int (*xMapWindow) (Display *d, Window w); /* 36 */
-    int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 37 */
-    int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 38 */
-    Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 39 */
-    int (*xRaiseWindow) (Display *d, Window w); /* 40 */
-    int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 41 */
-    int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 42 */
-    int (*xSelectInput) (Display *d, Window w, long l); /* 43 */
-    Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 44 */
-    int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */
-    int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */
-    int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */
-    int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */
-    int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */
-    int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */
-    int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 51 */
-    int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */
-    int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */
-    int (*xUngrabKeyboard) (Display *d, Time t); /* 54 */
-    int (*xUngrabPointer) (Display *d, Time t); /* 55 */
-    int (*xUnmapWindow) (Display *d, Window w); /* 56 */
-    int (*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); /* 57 */
-    Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 58 */
-    GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 59 */
-    int (*xFreeGC) (Display *display, GC gc); /* 60 */
-    Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 61 */
-    int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 62 */
-    int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 63 */
-    int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 64 */
-    int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 65 */
-    int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 66 */
-    int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 67 */
-    int (*xSetFont) (Display *display, GC gc, Font font); /* 68 */
-    int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 69 */
-    int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 70 */
-    int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 71 */
-    int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 72 */
-    int (*xSetFunction) (Display *display, GC gc, int function); /* 73 */
-    int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 74 */
-    int (*_XInitImageFuncPtrs) (XImage *image); /* 75 */
-    XIC (*xCreateIC) (XIM xim, ...); /* 76 */
-    XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */
-    void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 78 */
-    Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */
-    int (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */
-    int (*xForceScreenSaver) (Display *display, int mode); /* 81 */
-    int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */
-    int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */
-    int (*xClearWindow) (Display *d, Window w); /* 84 */
-    int (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */
-    int (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */
-    int (*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); /* 87 */
-    int (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */
-    int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */
-    Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */
-    int (*xSync) (Display *display, Bool discard); /* 91 */
-    Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 92 */
-    int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 93 */
-    int (*xFreeCursor) (Display *d, Cursor c); /* 94 */
-    int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 95 */
-    int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 96 */
-    int (*xNextEvent) (Display *d, XEvent *x); /* 97 */
-    int (*xPutBackEvent) (Display *d, XEvent *x); /* 98 */
-    int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 99 */
-    int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 100 */
-    Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 101 */
-    Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 102 */
-    Status (*xIconifyWindow) (Display *d, Window w, int i); /* 103 */
-    Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 104 */
-    XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 105 */
-    int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 106 */
+    Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 7 */
+    Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 8 */
+    GContext (*xGContextFromGC) (GC g); /* 9 */
+    XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 10 */
+    KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 11 */
+    KeySym (*xStringToKeysym) (_Xconst char *c); /* 12 */
+    Window (*xRootWindow) (Display *d, int i); /* 13 */
+    XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 14 */
+    Status (*xIconifyWindow) (Display *d, Window w, int i); /* 15 */
+    Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 16 */
+    Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 17 */
+    Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 18 */
+    int (*xBell) (Display *d, int i); /* 19 */
+    int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 20 */
+    int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 21 */
+    int (*xClearWindow) (Display *d, Window w); /* 22 */
+    int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 23 */
+    int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 24 */
+    int (*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); /* 25 */
+    Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 26 */
+    int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 27 */
+    int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 28 */
+    int (*xDestroyWindow) (Display *d, Window w); /* 29 */
+    int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 30 */
+    int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 31 */
+    int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 32 */
+    int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 33 */
+    int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 34 */
+    int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 35 */
+    int (*xForceScreenSaver) (Display *d, int i); /* 36 */
+    int (*xFreeColormap) (Display *d, Colormap c); /* 37 */
+    int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 38 */
+    int (*xFreeCursor) (Display *d, Cursor c); /* 39 */
+    int (*xFreeModifiermap) (XModifierKeymap *x); /* 40 */
+    Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 41 */
+    int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 42 */
+    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); /* 43 */
+    Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 44 */
+    int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 45 */
+    int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 46 */
+    KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 47 */
+    Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 48 */
+    int (*xMapWindow) (Display *d, Window w); /* 49 */
+    int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 50 */
+    int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 51 */
+    int (*xNextEvent) (Display *d, XEvent *x); /* 52 */
+    int (*xPutBackEvent) (Display *d, XEvent *x); /* 53 */
+    int (*xQueryColors) (Display *d, Colormap c, XColor *x, int i); /* 54 */
+    Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 55 */
+    Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 56 */
+    int (*xRaiseWindow) (Display *d, Window w); /* 57 */
+    int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 58 */
+    int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */
+    int (*xSelectInput) (Display *d, Window w, long l); /* 60 */
+    Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 61 */
+    int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 62 */
+    int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 63 */
+    int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 64 */
+    int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 65 */
+    int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 66 */
+    int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 67 */
+    int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 68 */
+    int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 69 */
+    int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 70 */
+    int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 71 */
+    Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 72 */
+    int (*xUngrabKeyboard) (Display *d, Time t); /* 73 */
+    int (*xUngrabPointer) (Display *d, Time t); /* 74 */
+    int (*xUnmapWindow) (Display *d, Window w); /* 75 */
+    int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 76 */
+    void (*xDestroyIC) (XIC x); /* 77 */
+    Bool (*xFilterEvent) (XEvent *x, Window w); /* 78 */
+    int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 79 */
+    int (*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); /* 80 */
+    int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 81 */
+    Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 82 */
+    GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 83 */
+    int (*xFreeGC) (Display *display, GC gc); /* 84 */
+    Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 85 */
+    int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 86 */
+    int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 87 */
+    int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 88 */
+    int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 89 */
+    int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 90 */
+    int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 91 */
+    int (*xSetFont) (Display *display, GC gc, Font font); /* 92 */
+    int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 93 */
+    int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 94 */
+    int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 95 */
+    int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 96 */
+    int (*xSetFunction) (Display *display, GC gc, int function); /* 97 */
+    int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 98 */
+    int (*_XInitImageFuncPtrs) (XImage *image); /* 99 */
+    XIC (*xCreateIC) (XIM xim, ...); /* 100 */
+    XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 101 */
+    void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 102 */
+    Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 103 */
+    int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */
+    int (*xWarpPointer) (Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */
+    int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 106 */
     int (*xFlush) (Display *display); /* 107 */
     int (*xGrabServer) (Display *display); /* 108 */
     int (*xUngrabServer) (Display *display); /* 109 */
     int (*xFree) (void *data); /* 110 */
     int (*xNoOp) (Display *display); /* 111 */
     XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
-    Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 113 */
+    int (*xSync) (Display *display, Bool discard); /* 113 */
     VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
     void (*reserved115)(void);
     void (*reserved116)(void);
@@ -1199,9 +1196,9 @@ typedef struct TkIntXlibStubs {
     int (*xFillArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 130 */
     int (*xDrawArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 131 */
     int (*xDrawRectangles) (Display *d, Drawable dr, GC gc, XRectangle *r, int n); /* 132 */
-    void (*reserved133)(void);
-    void (*reserved134)(void);
-    void (*reserved135)(void);
+    int (*xDrawSegments) (Display *d, Drawable dr, GC gc, XSegment *s, int n); /* 133 */
+    int (*xDrawPoint) (Display *d, Drawable dr, GC gc, int x, int y); /* 134 */
+    int (*xDrawPoints) (Display *d, Drawable dr, GC gc, XPoint *p, int n, int m); /* 135 */
     int (*xReparentWindow) (Display *d, Window w, Window p, int x, int y); /* 136 */
     int (*xPutImage) (Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); /* 137 */
     Region (*xPolygonRegion) (XPoint *pts, int n, int rule); /* 138 */
@@ -1210,9 +1207,9 @@ typedef struct TkIntXlibStubs {
     char * (*xSetICValues) (XIC xic, ...); /* 141 */
     char * (*xGetICValues) (XIC xic, ...); /* 142 */
     void (*xSetICFocus) (XIC xic); /* 143 */
-    void (*xDestroyIC) (XIC xic); /* 144 */
-    Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 145 */
-    Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 146 */
+    void (*reserved144)(void);
+    void (*reserved145)(void);
+    void (*reserved146)(void);
     void (*xFreeFontSet) (Display *display, XFontSet fontset); /* 147 */
     int (*xCloseIM) (XIM im); /* 148 */
     Bool (*xRegisterIMInstantiateCallback) (Display *dpy, struct _XrmHashBucketRec *rbd, char *res_name, char *res_class, XIDProc callback, XPointer client_data); /* 149 */
@@ -1561,206 +1558,206 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
 #define XCreateColormap \
 	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
+#define XCreatePixmapCursor \
+	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 7 */
+#define XCreateGlyphCursor \
+	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 8 */
 #define XGContextFromGC \
-	(tkIntXlibStubsPtr->xGContextFromGC) /* 7 */
+	(tkIntXlibStubsPtr->xGContextFromGC) /* 9 */
+#define XListHosts \
+	(tkIntXlibStubsPtr->xListHosts) /* 10 */
 #define XKeycodeToKeysym \
-	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */
+	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 11 */
 #define XStringToKeysym \
-	(tkIntXlibStubsPtr->xStringToKeysym) /* 9 */
+	(tkIntXlibStubsPtr->xStringToKeysym) /* 12 */
 #define XRootWindow \
-	(tkIntXlibStubsPtr->xRootWindow) /* 10 */
+	(tkIntXlibStubsPtr->xRootWindow) /* 13 */
 #define XSetErrorHandler \
-	(tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */
+	(tkIntXlibStubsPtr->xSetErrorHandler) /* 14 */
+#define XIconifyWindow \
+	(tkIntXlibStubsPtr->xIconifyWindow) /* 15 */
+#define XWithdrawWindow \
+	(tkIntXlibStubsPtr->xWithdrawWindow) /* 16 */
+#define XGetWMColormapWindows \
+	(tkIntXlibStubsPtr->xGetWMColormapWindows) /* 17 */
 #define XAllocColor \
-	(tkIntXlibStubsPtr->xAllocColor) /* 12 */
+	(tkIntXlibStubsPtr->xAllocColor) /* 18 */
 #define XBell \
-	(tkIntXlibStubsPtr->xBell) /* 13 */
+	(tkIntXlibStubsPtr->xBell) /* 19 */
 #define XChangeProperty \
-	(tkIntXlibStubsPtr->xChangeProperty) /* 14 */
+	(tkIntXlibStubsPtr->xChangeProperty) /* 20 */
 #define XChangeWindowAttributes \
-	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */
+	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 21 */
+#define XClearWindow \
+	(tkIntXlibStubsPtr->xClearWindow) /* 22 */
 #define XConfigureWindow \
-	(tkIntXlibStubsPtr->xConfigureWindow) /* 16 */
+	(tkIntXlibStubsPtr->xConfigureWindow) /* 23 */
 #define XCopyArea \
-	(tkIntXlibStubsPtr->xCopyArea) /* 17 */
+	(tkIntXlibStubsPtr->xCopyArea) /* 24 */
 #define XCopyPlane \
-	(tkIntXlibStubsPtr->xCopyPlane) /* 18 */
+	(tkIntXlibStubsPtr->xCopyPlane) /* 25 */
 #define XCreateBitmapFromData \
-	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */
+	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 26 */
 #define XDefineCursor \
-	(tkIntXlibStubsPtr->xDefineCursor) /* 20 */
+	(tkIntXlibStubsPtr->xDefineCursor) /* 27 */
+#define XDeleteProperty \
+	(tkIntXlibStubsPtr->xDeleteProperty) /* 28 */
 #define XDestroyWindow \
-	(tkIntXlibStubsPtr->xDestroyWindow) /* 21 */
+	(tkIntXlibStubsPtr->xDestroyWindow) /* 29 */
 #define XDrawArc \
-	(tkIntXlibStubsPtr->xDrawArc) /* 22 */
+	(tkIntXlibStubsPtr->xDrawArc) /* 30 */
 #define XDrawLines \
-	(tkIntXlibStubsPtr->xDrawLines) /* 23 */
+	(tkIntXlibStubsPtr->xDrawLines) /* 31 */
 #define XDrawRectangle \
-	(tkIntXlibStubsPtr->xDrawRectangle) /* 24 */
+	(tkIntXlibStubsPtr->xDrawRectangle) /* 32 */
 #define XFillArc \
-	(tkIntXlibStubsPtr->xFillArc) /* 25 */
+	(tkIntXlibStubsPtr->xFillArc) /* 33 */
 #define XFillPolygon \
-	(tkIntXlibStubsPtr->xFillPolygon) /* 26 */
+	(tkIntXlibStubsPtr->xFillPolygon) /* 34 */
 #define XFillRectangles \
-	(tkIntXlibStubsPtr->xFillRectangles) /* 27 */
+	(tkIntXlibStubsPtr->xFillRectangles) /* 35 */
+#define XForceScreenSaver \
+	(tkIntXlibStubsPtr->xForceScreenSaver) /* 36 */
 #define XFreeColormap \
-	(tkIntXlibStubsPtr->xFreeColormap) /* 28 */
+	(tkIntXlibStubsPtr->xFreeColormap) /* 37 */
 #define XFreeColors \
-	(tkIntXlibStubsPtr->xFreeColors) /* 29 */
+	(tkIntXlibStubsPtr->xFreeColors) /* 38 */
+#define XFreeCursor \
+	(tkIntXlibStubsPtr->xFreeCursor) /* 39 */
 #define XFreeModifiermap \
-	(tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */
+	(tkIntXlibStubsPtr->xFreeModifiermap) /* 40 */
 #define XGetGeometry \
-	(tkIntXlibStubsPtr->xGetGeometry) /* 31 */
+	(tkIntXlibStubsPtr->xGetGeometry) /* 41 */
+#define XGetInputFocus \
+	(tkIntXlibStubsPtr->xGetInputFocus) /* 42 */
 #define XGetWindowProperty \
-	(tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */
+	(tkIntXlibStubsPtr->xGetWindowProperty) /* 43 */
+#define XGetWindowAttributes \
+	(tkIntXlibStubsPtr->xGetWindowAttributes) /* 44 */
 #define XGrabKeyboard \
-	(tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */
+	(tkIntXlibStubsPtr->xGrabKeyboard) /* 45 */
 #define XGrabPointer \
-	(tkIntXlibStubsPtr->xGrabPointer) /* 34 */
+	(tkIntXlibStubsPtr->xGrabPointer) /* 46 */
 #define XKeysymToKeycode \
-	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */
+	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 47 */
+#define XLookupColor \
+	(tkIntXlibStubsPtr->xLookupColor) /* 48 */
 #define XMapWindow \
-	(tkIntXlibStubsPtr->xMapWindow) /* 36 */
+	(tkIntXlibStubsPtr->xMapWindow) /* 49 */
 #define XMoveResizeWindow \
-	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */
+	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 50 */
 #define XMoveWindow \
-	(tkIntXlibStubsPtr->xMoveWindow) /* 38 */
+	(tkIntXlibStubsPtr->xMoveWindow) /* 51 */
+#define XNextEvent \
+	(tkIntXlibStubsPtr->xNextEvent) /* 52 */
+#define XPutBackEvent \
+	(tkIntXlibStubsPtr->xPutBackEvent) /* 53 */
+#define XQueryColors \
+	(tkIntXlibStubsPtr->xQueryColors) /* 54 */
 #define XQueryPointer \
-	(tkIntXlibStubsPtr->xQueryPointer) /* 39 */
+	(tkIntXlibStubsPtr->xQueryPointer) /* 55 */
+#define XQueryTree \
+	(tkIntXlibStubsPtr->xQueryTree) /* 56 */
 #define XRaiseWindow \
-	(tkIntXlibStubsPtr->xRaiseWindow) /* 40 */
+	(tkIntXlibStubsPtr->xRaiseWindow) /* 57 */
 #define XRefreshKeyboardMapping \
-	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */
+	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 58 */
 #define XResizeWindow \
-	(tkIntXlibStubsPtr->xResizeWindow) /* 42 */
+	(tkIntXlibStubsPtr->xResizeWindow) /* 59 */
 #define XSelectInput \
-	(tkIntXlibStubsPtr->xSelectInput) /* 43 */
+	(tkIntXlibStubsPtr->xSelectInput) /* 60 */
 #define XSendEvent \
-	(tkIntXlibStubsPtr->xSendEvent) /* 44 */
+	(tkIntXlibStubsPtr->xSendEvent) /* 61 */
+#define XSetCommand \
+	(tkIntXlibStubsPtr->xSetCommand) /* 62 */
 #define XSetIconName \
-	(tkIntXlibStubsPtr->xSetIconName) /* 45 */
+	(tkIntXlibStubsPtr->xSetIconName) /* 63 */
 #define XSetInputFocus \
-	(tkIntXlibStubsPtr->xSetInputFocus) /* 46 */
+	(tkIntXlibStubsPtr->xSetInputFocus) /* 64 */
 #define XSetSelectionOwner \
-	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */
+	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 65 */
 #define XSetWindowBackground \
-	(tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */
+	(tkIntXlibStubsPtr->xSetWindowBackground) /* 66 */
 #define XSetWindowBackgroundPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */
+	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 67 */
 #define XSetWindowBorder \
-	(tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */
+	(tkIntXlibStubsPtr->xSetWindowBorder) /* 68 */
 #define XSetWindowBorderPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */
+	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 69 */
 #define XSetWindowBorderWidth \
-	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */
+	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 70 */
 #define XSetWindowColormap \
-	(tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */
+	(tkIntXlibStubsPtr->xSetWindowColormap) /* 71 */
+#define XTranslateCoordinates \
+	(tkIntXlibStubsPtr->xTranslateCoordinates) /* 72 */
 #define XUngrabKeyboard \
-	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */
+	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 73 */
 #define XUngrabPointer \
-	(tkIntXlibStubsPtr->xUngrabPointer) /* 55 */
+	(tkIntXlibStubsPtr->xUngrabPointer) /* 74 */
 #define XUnmapWindow \
-	(tkIntXlibStubsPtr->xUnmapWindow) /* 56 */
+	(tkIntXlibStubsPtr->xUnmapWindow) /* 75 */
+#define XWindowEvent \
+	(tkIntXlibStubsPtr->xWindowEvent) /* 76 */
+#define XDestroyIC \
+	(tkIntXlibStubsPtr->xDestroyIC) /* 77 */
+#define XFilterEvent \
+	(tkIntXlibStubsPtr->xFilterEvent) /* 78 */
+#define XmbLookupString \
+	(tkIntXlibStubsPtr->xmbLookupString) /* 79 */
 #define TkPutImage \
-	(tkIntXlibStubsPtr->tkPutImage) /* 57 */
+	(tkIntXlibStubsPtr->tkPutImage) /* 80 */
+#define XSetClipRectangles \
+	(tkIntXlibStubsPtr->xSetClipRectangles) /* 81 */
 #define XParseColor \
-	(tkIntXlibStubsPtr->xParseColor) /* 58 */
+	(tkIntXlibStubsPtr->xParseColor) /* 82 */
 #define XCreateGC \
-	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
+	(tkIntXlibStubsPtr->xCreateGC) /* 83 */
 #define XFreeGC \
-	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
+	(tkIntXlibStubsPtr->xFreeGC) /* 84 */
 #define XInternAtom \
-	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
+	(tkIntXlibStubsPtr->xInternAtom) /* 85 */
 #define XSetBackground \
-	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
+	(tkIntXlibStubsPtr->xSetBackground) /* 86 */
 #define XSetForeground \
-	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
+	(tkIntXlibStubsPtr->xSetForeground) /* 87 */
 #define XSetClipMask \
-	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
+	(tkIntXlibStubsPtr->xSetClipMask) /* 88 */
 #define XSetClipOrigin \
-	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
+	(tkIntXlibStubsPtr->xSetClipOrigin) /* 89 */
 #define XSetTSOrigin \
-	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
+	(tkIntXlibStubsPtr->xSetTSOrigin) /* 90 */
 #define XChangeGC \
-	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
+	(tkIntXlibStubsPtr->xChangeGC) /* 91 */
 #define XSetFont \
-	(tkIntXlibStubsPtr->xSetFont) /* 68 */
+	(tkIntXlibStubsPtr->xSetFont) /* 92 */
 #define XSetArcMode \
-	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
+	(tkIntXlibStubsPtr->xSetArcMode) /* 93 */
 #define XSetStipple \
-	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
+	(tkIntXlibStubsPtr->xSetStipple) /* 94 */
 #define XSetFillRule \
-	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
+	(tkIntXlibStubsPtr->xSetFillRule) /* 95 */
 #define XSetFillStyle \
-	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
+	(tkIntXlibStubsPtr->xSetFillStyle) /* 96 */
 #define XSetFunction \
-	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
+	(tkIntXlibStubsPtr->xSetFunction) /* 97 */
 #define XSetLineAttributes \
-	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
+	(tkIntXlibStubsPtr->xSetLineAttributes) /* 98 */
 #define _XInitImageFuncPtrs \
-	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
+	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 99 */
 #define XCreateIC \
-	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
+	(tkIntXlibStubsPtr->xCreateIC) /* 100 */
 #define XGetVisualInfo \
-	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
+	(tkIntXlibStubsPtr->xGetVisualInfo) /* 101 */
 #define XSetWMClientMachine \
-	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
+	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 102 */
 #define XStringListToTextProperty \
-	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
-#define XDrawSegments \
-	(tkIntXlibStubsPtr->xDrawSegments) /* 80 */
-#define XForceScreenSaver \
-	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
+	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 103 */
 #define XDrawLine \
-	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
-#define XFillRectangle \
-	(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
-#define XClearWindow \
-	(tkIntXlibStubsPtr->xClearWindow) /* 84 */
-#define XDrawPoint \
-	(tkIntXlibStubsPtr->xDrawPoint) /* 85 */
-#define XDrawPoints \
-	(tkIntXlibStubsPtr->xDrawPoints) /* 86 */
+	(tkIntXlibStubsPtr->xDrawLine) /* 104 */
 #define XWarpPointer \
-	(tkIntXlibStubsPtr->xWarpPointer) /* 87 */
-#define XQueryColor \
-	(tkIntXlibStubsPtr->xQueryColor) /* 88 */
-#define XQueryColors \
-	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
-#define XQueryTree \
-	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
-#define XSync \
-	(tkIntXlibStubsPtr->xSync) /* 91 */
-#define XTranslateCoordinates \
-	(tkIntXlibStubsPtr->xTranslateCoordinates) /* 92 */
-#define XDeleteProperty \
-	(tkIntXlibStubsPtr->xDeleteProperty) /* 93 */
-#define XFreeCursor \
-	(tkIntXlibStubsPtr->xFreeCursor) /* 94 */
-#define XGetInputFocus \
-	(tkIntXlibStubsPtr->xGetInputFocus) /* 95 */
-#define XmbLookupString \
-	(tkIntXlibStubsPtr->xmbLookupString) /* 96 */
-#define XNextEvent \
-	(tkIntXlibStubsPtr->xNextEvent) /* 97 */
-#define XPutBackEvent \
-	(tkIntXlibStubsPtr->xPutBackEvent) /* 98 */
-#define XSetCommand \
-	(tkIntXlibStubsPtr->xSetCommand) /* 99 */
-#define XWindowEvent \
-	(tkIntXlibStubsPtr->xWindowEvent) /* 100 */
-#define XGetWindowAttributes \
-	(tkIntXlibStubsPtr->xGetWindowAttributes) /* 101 */
-#define XGetWMColormapWindows \
-	(tkIntXlibStubsPtr->xGetWMColormapWindows) /* 102 */
-#define XIconifyWindow \
-	(tkIntXlibStubsPtr->xIconifyWindow) /* 103 */
-#define XWithdrawWindow \
-	(tkIntXlibStubsPtr->xWithdrawWindow) /* 104 */
-#define XListHosts \
-	(tkIntXlibStubsPtr->xListHosts) /* 105 */
-#define XSetClipRectangles \
-	(tkIntXlibStubsPtr->xSetClipRectangles) /* 106 */
+	(tkIntXlibStubsPtr->xWarpPointer) /* 105 */
+#define XFillRectangle \
+	(tkIntXlibStubsPtr->xFillRectangle) /* 106 */
 #define XFlush \
 	(tkIntXlibStubsPtr->xFlush) /* 107 */
 #define XGrabServer \
@@ -1773,8 +1770,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xNoOp) /* 111 */
 #define XSynchronize \
 	(tkIntXlibStubsPtr->xSynchronize) /* 112 */
-#define XLookupColor \
-	(tkIntXlibStubsPtr->xLookupColor) /* 113 */
+#define XSync \
+	(tkIntXlibStubsPtr->xSync) /* 113 */
 #define XVisualIDFromVisual \
 	(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
 /* Slot 115 is reserved */
@@ -1802,9 +1799,12 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xDrawArcs) /* 131 */
 #define XDrawRectangles \
 	(tkIntXlibStubsPtr->xDrawRectangles) /* 132 */
-/* Slot 133 is reserved */
-/* Slot 134 is reserved */
-/* Slot 135 is reserved */
+#define XDrawSegments \
+	(tkIntXlibStubsPtr->xDrawSegments) /* 133 */
+#define XDrawPoint \
+	(tkIntXlibStubsPtr->xDrawPoint) /* 134 */
+#define XDrawPoints \
+	(tkIntXlibStubsPtr->xDrawPoints) /* 135 */
 #define XReparentWindow \
 	(tkIntXlibStubsPtr->xReparentWindow) /* 136 */
 #define XPutImage \
@@ -1821,12 +1821,9 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xGetICValues) /* 142 */
 #define XSetICFocus \
 	(tkIntXlibStubsPtr->xSetICFocus) /* 143 */
-#define XDestroyIC \
-	(tkIntXlibStubsPtr->xDestroyIC) /* 144 */
-#define XCreatePixmapCursor \
-	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 145 */
-#define XCreateGlyphCursor \
-	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 146 */
+/* Slot 144 is reserved */
+/* Slot 145 is reserved */
+/* Slot 146 is reserved */
 #define XFreeFontSet \
 	(tkIntXlibStubsPtr->xFreeFontSet) /* 147 */
 #define XCloseIM \
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 4419d70..c41715b 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -247,9 +247,6 @@ Tk_MainEx(
      */
 
     if (NULL == Tcl_GetStartupScript(NULL)) {
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-	size_t length;
-#endif
 
 	/*
 	 * Check whether first 3 args (argv[1] - argv[3]) look like
@@ -273,14 +270,6 @@ Tk_MainEx(
 	    Tcl_SetStartupScript(NewNativeObj(argv[1]), NULL);
 	    argc--;
 	    i++;
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-	} else if ((argc >= 2) && (length = _tcslen(argv[1]))
-		&& (length > 1) && (0 == _tcsncmp(TEXT("-file"), argv[1], length))
-		&& ('-' != argv[2][0])) {
-	    Tcl_SetStartupScript(NewNativeObj(argv[2]), NULL);
-	    argc -= 2;
-	    i += 2;
-#endif
 	}
     }
 
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 07fc3f1..a1df355 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -855,12 +855,11 @@ MenuWidgetObjCmd(
 	if (GetMenuIndex(interp, menuPtr, objv[2], 0, &index) != TCL_OK) {
 	    goto error;
 	}
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
 	if (index < 0) {
 	    Tcl_SetObjResult(interp, Tcl_NewObj());
-	} else
-#endif
-	Tcl_SetObjResult(interp, TkNewIndexObj(index));
+	} else {
+	    Tcl_SetObjResult(interp, TkNewIndexObj(index));
+	}
 	break;
     }
     case MENU_INSERT:
@@ -2186,12 +2185,6 @@ GetMenuIndex(
 	*indexPtr = TCL_INDEX_NONE;
 	return TCL_OK;
     }
-#if !defined(TK_NO_DEPRECATED) && TK_MAJOR_VERSION < 9
-    if ((string[0] == 'n') && (strcmp(string, "none") == 0)) {
-	*indexPtr = TCL_INDEX_NONE;
-	return TCL_OK;
-    }
-#endif
 
     if (string[0] == '@') {
 	if (GetIndexFromCoords(interp, menuPtr, string, indexPtr)
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 8978886..68f4acd 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -96,35 +96,6 @@ static int		SetMMFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static int		SetPixelFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static int		SetWindowFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 
-#if TCL_MAJOR_VERSION < 9
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if defined(USE_TCL_STUBS)
-/*  Little hack to eliminate the need for "tclInt.h" here:
-    Just copy a small portion of TclIntStubs, just
-    enough to make it work */
-typedef struct TclIntStubs {
-    int magic;
-    void *hooks;
-    void (*dummy[34]) (void); /* dummy entries 0-33, not used */
-    int (*tclGetIntForIndex) (Tcl_Interp *interp, Tcl_Obj *objPtr, int endValue, int *indexPtr); /* 34 */
-} TclIntStubs;
-extern const TclIntStubs *tclIntStubsPtr;
-
-# undef Tcl_GetIntForIndex
-# define Tcl_GetIntForIndex(interp, obj, max, ptr) ((tclIntStubsPtr->tclGetIntForIndex == NULL)? \
-    ((int (*)(Tcl_Interp*,  Tcl_Obj *, int, int*))(void *)((&(tclStubsPtr->tcl_PkgProvideEx))[645]))((interp), (obj), (max), (ptr)): \
-	tclIntStubsPtr->tclGetIntForIndex((interp), (obj), (max), (ptr)))
-#elif TCL_MINOR_VERSION < 7
-extern int TclGetIntForIndex(Tcl_Interp*,  Tcl_Obj *, int, int*);
-# define Tcl_GetIntForIndex(interp, obj, max, ptr) TclGetIntForIndex(interp, obj, max, ptr)
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-
 /*
  * The following structure defines the implementation of the "pixel" Tcl
  * object, used for measuring distances. The pixel object remembers its
diff --git a/generic/tkOldTest.c b/generic/tkOldTest.c
deleted file mode 100644
index d135958..0000000
--- a/generic/tkOldTest.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * tkOldTest.c --
- *
- *	This file contains C command functions for additional Tcl
- *	commands that are used to test Tk's support for legacy
- *	interfaces.  These commands are not normally included in Tcl/Tk
- *	applications; they're only used for testing.
- *
- * Copyright © 1993-1994 The Regents of the University of California.
- * Copyright © 1994-1997 Sun Microsystems, Inc.
- * Copyright © 1998-1999 Scriptics Corporation.
- * Contributions by Don Porter, NIST, 2007.  (not subject to US copyright)
- *
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
-
-#define USE_OLD_IMAGE
-#ifndef USE_TCL_STUBS
-#   define USE_TCL_STUBS
-#endif
-#ifndef USE_TK_STUBS
-#   define USE_TK_STUBS
-#endif
-#include "tkInt.h"
-
-#ifdef _WIN32
-#include "tkWinInt.h"
-#endif
-
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-/*
- * The following data structure represents the model for a test image:
- */
-
-typedef struct TImageModel {
-    Tk_ImageModel model;        /* Tk's token for image model. */
-    Tcl_Interp *interp;         /* Interpreter for application. */
-    int width, height;          /* Dimensions of image. */
-    char *imageName;            /* Name of image (malloc-ed). */
-    char *varName;              /* Name of variable in which to log events for
-                                 * image (malloc-ed). */
-} TImageModel;
-
-/*
- * The following data structure represents a particular use of a particular
- * test image.
- */
-
-typedef struct TImageInstance {
-    TImageModel *modelPtr;    /* Pointer to model for image. */
-    XColor *fg;                 /* Foreground color for drawing in image. */
-    GC gc;                      /* Graphics context for drawing in image. */
-} TImageInstance;
-
-/*
- * The type record for test images:
- */
-
-static int		ImageCreate(Tcl_Interp *interp,
-			    char *name, Tcl_Size argc, char **argv,
-			    Tk_ImageType *typePtr, Tk_ImageModel model,
-			    ClientData *clientDataPtr);
-static ClientData	ImageGet(Tk_Window tkwin, ClientData clientData);
-static void		ImageDisplay(ClientData clientData,
-			    Display *display, Drawable drawable,
-			    int imageX, int imageY, int width,
-			    int height, int drawableX,
-			    int drawableY);
-static void		ImageFree(ClientData clientData, Display *display);
-static void		ImageDelete(ClientData clientData);
-
-static Tk_ImageType imageType = {
-    "oldtest",			/* name */
-    (Tk_ImageCreateProc *) ImageCreate, /* createProc */
-    ImageGet,			/* getProc */
-    ImageDisplay,		/* displayProc */
-    ImageFree,			/* freeProc */
-    ImageDelete,		/* deleteProc */
-    NULL,			/* postscriptPtr */
-    NULL,			/* nextPtr */
-    NULL
-};
-
-/*
- * Forward declarations for functions defined later in this file:
- */
-
-static int              ImageObjCmd(ClientData dummy,
-                            Tcl_Interp *interp, int objc,
-            			    Tcl_Obj * const objv[]);
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * TkOldTestInit --
- *
- *	This function performs initialization for the Tk test suite
- *	extensions for testing support for legacy interfaces.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error message in
- *	the interp's result if an error occurs.
- *
- * Side effects:
- *	Creates several test commands.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TkOldTestInit(
-    Tcl_Interp *dummy)
-{
-    static int initialized = 0;
-    (void)dummy;
-
-    if (!initialized) {
-	initialized = 1;
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-	Tk_CreateImageType(&imageType);
-#endif
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImageCreate --
- *
- *	This function is called by the Tk image code to create "oldtest" images.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	The data structure for a new image is allocated.
- *
- *----------------------------------------------------------------------
- */
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-static int
-ImageCreate(
-    Tcl_Interp *interp,		/* Interpreter for application containing
-				 * image. */
-    char *name,			/* Name to use for image. */
-    Tcl_Size argc,			/* Number of arguments. */
-    char **argv,		/* Argument strings for options (doesn't
-				 * include image name or type). */
-    Tk_ImageType *typePtr,	/* Pointer to our type record (not used). */
-    Tk_ImageModel model,	/* Token for image, to be used by us in later
-				 * callbacks. */
-    ClientData *clientDataPtr)	/* Store manager's token for image here; it
-				 * will be returned in later callbacks. */
-{
-    TImageModel *timPtr;
-    const char *varName;
-    Tcl_Size i;
-    (void)typePtr;
-
-    varName = "log";
-    for (i = 0; i < argc; i += 2) {
-	if (strcmp(argv[i], "-variable") != 0) {
-	    Tcl_AppendResult(interp, "bad option name \"",
-		    argv[i], "\"", NULL);
-	    return TCL_ERROR;
-	}
-	if ((i+1) == argc) {
-	    Tcl_AppendResult(interp, "no value given for \"",
-		    argv[i], "\" option", NULL);
-	    return TCL_ERROR;
-	}
-	varName = argv[i+1];
-    }
-
-    timPtr = (TImageModel *)ckalloc(sizeof(TImageModel));
-    timPtr->model = model;
-    timPtr->interp = interp;
-    timPtr->width = 30;
-    timPtr->height = 15;
-    timPtr->imageName = (char *)ckalloc(strlen(name) + 1);
-    strcpy(timPtr->imageName, name);
-    timPtr->varName = (char *)ckalloc(strlen(varName) + 1);
-    strcpy(timPtr->varName, varName);
-    Tcl_CreateObjCommand(interp, name, ImageObjCmd, timPtr, NULL);
-    *clientDataPtr = timPtr;
-    Tk_ImageChanged(model, 0, 0, 30, 15, 30, 15);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImageObjCmd --
- *
- *	This function implements the commands corresponding to individual
- *	images.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Forces windows to be created.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ImageObjCmd(
-    ClientData clientData,	/* Main window for application. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])		/* Argument strings. */
-{
-    TImageModel *timPtr = (TImageModel *)clientData;
-    int x, y, width, height;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
-	return TCL_ERROR;
-    }
-    if (strcmp(Tcl_GetString(objv[1]), "changed") == 0) {
-	if (objc != 8) {
-	    Tcl_WrongNumArgs(interp, 1, objv, "changed x y width height"
-		    " imageWidth imageHeight");
-	    return TCL_ERROR;
-	}
-	if ((Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK)
-		|| (Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK)
-		|| (Tcl_GetIntFromObj(interp, objv[4], &width) != TCL_OK)
-		|| (Tcl_GetIntFromObj(interp, objv[5], &height) != TCL_OK)
-		|| (Tcl_GetIntFromObj(interp, objv[6], &timPtr->width) != TCL_OK)
-		|| (Tcl_GetIntFromObj(interp, objv[7], &timPtr->height) != TCL_OK)) {
-	    return TCL_ERROR;
-	}
-	Tk_ImageChanged(timPtr->model, x, y, width, height, timPtr->width,
-		timPtr->height);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),
-		"\": must be changed", NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImageGet --
- *
- *	This function is called by Tk to set things up for using a test image
- *	in a particular widget.
- *
- * Results:
- *	The return value is a token for the image instance, which is used in
- *	future callbacks to ImageDisplay and ImageFree.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static ClientData
-ImageGet(
-    Tk_Window tkwin,		/* Token for window in which image will be
-				 * used. */
-    ClientData clientData)	/* Pointer to TImageModel for image. */
-{
-    TImageModel *timPtr = (TImageModel *)clientData;
-    TImageInstance *instPtr;
-    char buffer[100];
-    XGCValues gcValues;
-
-    snprintf(buffer, sizeof(buffer), "%s get", timPtr->imageName);
-    Tcl_SetVar2(timPtr->interp, timPtr->varName, NULL, buffer,
-	    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
-
-    instPtr = (TImageInstance *)ckalloc(sizeof(TImageInstance));
-    instPtr->modelPtr = timPtr;
-    instPtr->fg = Tk_GetColor(timPtr->interp, tkwin, "#ff0000");
-    gcValues.foreground = instPtr->fg->pixel;
-    instPtr->gc = Tk_GetGC(tkwin, GCForeground, &gcValues);
-    return instPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImageDisplay --
- *
- *	This function is invoked to redisplay part or all of an image in a
- *	given drawable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The image gets partially redrawn, as an "X" that shows the exact
- *	redraw area.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ImageDisplay(
-    ClientData clientData,	/* Pointer to TImageInstance for image. */
-    Display *display,		/* Display to use for drawing. */
-    Drawable drawable,		/* Where to redraw image. */
-    int imageX, int imageY,	/* Origin of area to redraw, relative to
-				 * origin of image. */
-    int width, int height,	/* Dimensions of area to redraw. */
-    int drawableX, int drawableY)
-				/* Coordinates in drawable corresponding to
-				 * imageX and imageY. */
-{
-    TImageInstance *instPtr = (TImageInstance *)clientData;
-    char buffer[200 + TCL_INTEGER_SPACE * 6];
-
-    snprintf(buffer, sizeof(buffer), "%s display %d %d %d %d %d %d",
-	    instPtr->modelPtr->imageName, imageX, imageY, width, height,
-	    drawableX, drawableY);
-    Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName, NULL,
-	    buffer, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
-    if (width > (instPtr->modelPtr->width - imageX)) {
-	width = instPtr->modelPtr->width - imageX;
-    }
-    if (height > (instPtr->modelPtr->height - imageY)) {
-	height = instPtr->modelPtr->height - imageY;
-    }
-    XDrawRectangle(display, drawable, instPtr->gc, drawableX, drawableY,
-	    (unsigned) (width-1), (unsigned) (height-1));
-    XDrawLine(display, drawable, instPtr->gc, drawableX, drawableY,
-	    (int) (drawableX + width - 1), (int) (drawableY + height - 1));
-    XDrawLine(display, drawable, instPtr->gc, drawableX,
-	    (int) (drawableY + height - 1),
-	    (int) (drawableX + width - 1), drawableY);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImageFree --
- *
- *	This function is called when an instance of an image is no longer
- *	used.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Information related to the instance is freed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ImageFree(
-    ClientData clientData,	/* Pointer to TImageInstance for instance. */
-    Display *display)		/* Display where image was to be drawn. */
-{
-    TImageInstance *instPtr = (TImageInstance *)clientData;
-    char buffer[200];
-
-    snprintf(buffer, sizeof(buffer), "%s free", instPtr->modelPtr->imageName);
-    Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName, NULL,
-	    buffer, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
-    Tk_FreeColor(instPtr->fg);
-    Tk_FreeGC(display, instPtr->gc);
-    ckfree(instPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImageDelete --
- *
- *	This function is called to clean up a test image when an application
- *	goes away.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Information about the image is deleted.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ImageDelete(
-    ClientData clientData)	/* Pointer to TImageModel for image. When
-				 * this function is called, no more instances
-				 * exist. */
-{
-    TImageModel *timPtr = (TImageModel *)clientData;
-    char buffer[100];
-
-    snprintf(buffer, sizeof(buffer), "%s delete", timPtr->imageName);
-    Tcl_SetVar2(timPtr->interp, timPtr->varName, NULL, buffer,
-	    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
-
-    Tcl_DeleteCommand(timPtr->interp, timPtr->imageName);
-    ckfree(timPtr->imageName);
-    ckfree(timPtr->varName);
-    ckfree(timPtr);
-}
-#endif
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */
diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c
index 5050f8a..2c32a18 100644
--- a/generic/tkPkgConfig.c
+++ b/generic/tkPkgConfig.c
@@ -95,14 +95,6 @@
 #endif
 
 static const Tcl_Config cfg[] = {
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-    {"debug",			CFG_DEBUG},
-    {"threaded",		CFG_THREADED},
-    {"profiled",		CFG_PROFILED},
-    {"64bit",			CFG_64},
-    {"optimized",		CFG_OPTIMIZED},
-    {"mem_debug",		CFG_MEMDEBUG},
-#endif
     {"fontsystem",		CFG_FONTSYSTEM},
 
     /* Runtime paths to various stuff */
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 422407f..c546167 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -46,12 +46,6 @@ EXTERN HINSTANCE	Tk_GetHINSTANCE(void);
 EXTERN HWND		Tk_GetHWND(Window window);
 /* 3 */
 EXTERN Tk_Window	Tk_HWNDToWindow(HWND hwnd);
-/* 4 */
-EXTERN void		Tk_PointerEvent(HWND hwnd, int x, int y);
-/* 5 */
-EXTERN int		Tk_TranslateWinEvent(HWND hwnd, UINT message,
-				WPARAM wParam, LPARAM lParam,
-				LRESULT *result);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
 /* Slot 0 is reserved */
@@ -60,9 +54,7 @@ EXTERN int		Tk_TranslateWinEvent(HWND hwnd, UINT message,
 /* Slot 3 is reserved */
 /* 4 */
 EXTERN void		TkMacOSXInitAppleEvents(Tcl_Interp *interp);
-/* 5 */
-EXTERN void		TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
-				int width, int height, int flags);
+/* Slot 5 is reserved */
 /* 6 */
 EXTERN void		TkMacOSXInvalClipRgns(Tk_Window tkwin);
 /* Slot 7 is reserved */
@@ -94,8 +86,6 @@ typedef struct TkPlatStubs {
     HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */
     HWND (*tk_GetHWND) (Window window); /* 2 */
     Tk_Window (*tk_HWNDToWindow) (HWND hwnd); /* 3 */
-    void (*tk_PointerEvent) (HWND hwnd, int x, int y); /* 4 */
-    int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result); /* 5 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*reserved0)(void);
@@ -103,7 +93,7 @@ typedef struct TkPlatStubs {
     void (*reserved2)(void);
     void (*reserved3)(void);
     void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
-    void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
+    void (*reserved5)(void);
     void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
     void (*reserved7)(void);
     void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
@@ -139,10 +129,6 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_GetHWND) /* 2 */
 #define Tk_HWNDToWindow \
 	(tkPlatStubsPtr->tk_HWNDToWindow) /* 3 */
-#define Tk_PointerEvent \
-	(tkPlatStubsPtr->tk_PointerEvent) /* 4 */
-#define Tk_TranslateWinEvent \
-	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
 /* Slot 0 is reserved */
@@ -151,8 +137,7 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 /* Slot 3 is reserved */
 #define TkMacOSXInitAppleEvents \
 	(tkPlatStubsPtr->tkMacOSXInitAppleEvents) /* 4 */
-#define TkGenWMConfigureEvent_ \
-	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 5 */
+/* Slot 5 is reserved */
 #define TkMacOSXInvalClipRgns \
 	(tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 6 */
 /* Slot 7 is reserved */
@@ -185,7 +170,6 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-#undef TkGenWMConfigureEvent_
 #define Tk_MacOSXGetNSViewForDrawable TkMacOSXGetRootControl
 
 #endif /* _TKPLATDECLS */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 4e7d270..dc7947f 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -39,88 +39,28 @@ MODULE_SCOPE const TkStubs tkStubs;
  * Remove macro that might interfere with the definition below.
  */
 
-#undef Tk_MainEx
-#undef Tk_FreeXId
-#undef Tk_FreeStyleFromObj
-#undef Tk_GetStyleFromObj
-#undef TkWinGetPlatformId
 #undef TkPutImage
 #undef XPutImage
-#define TkMacOSXSetUpClippingRgn (void (*)(Drawable))(void *)doNothing
-#undef TkMacOSXIsCharacterMissing
-#define TkMacOSXIsCharacterMissing (int (*)(Tk_Font, unsigned int))(void *)doNothing
 
-#if defined(_WIN32) && !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-#   define Tk_TranslateWinEvent TkTranslateWinEvent
-#   define Tk_PointerEvent TkWinPointerEvent
-#define TkWinGetPlatformId winGetPlatformId
-static int TkWinGetPlatformId(void) {
-    return 2;
-}
-#else
-#   define Tk_TranslateWinEvent 0
-#   define Tk_PointerEvent 0
-#   define TkWinGetPlatformId 0
-#endif
-
-#if defined(TK_NO_DEPRECATED) || (TCL_MAJOR_VERSION > 8)
-#   define TkSetWindowMenuBar 0
-#   define TkpDrawHighlightBorder 0
-#   define TkpUseWindow 0
-#   define TkpSetMainMenubar 0
-#   define TkpGetOtherWindow 0
-#   define TkpGetSystemDefault 0
-#   define TkpMakeContainer 0
-#   define TkpMakeWindow 0
-#endif
+#define TkMacOSXDrawable Tk_MacOSXGetNSWindowForDrawable
 
+#if !defined(MAC_OSX_TK)
 static int
 doNothing(void)
 {
     /* dummy implementation, no need to do anything */
     return 0;
 }
-
-#if defined(TK_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
-#define Tk_MainEx 0
-#define Tk_FreeXId 0
-#define Tk_FreeStyleFromObj 0
-#define Tk_GetStyleFromObj 0
-#define TkWinGetPlatformId 0
-#define Tk_PhotoPutBlock_NoComposite 0
-#define Tk_PhotoPutZoomedBlock_NoComposite 0
-#define Tk_PhotoExpand_Panic 0
-#define Tk_PhotoPutBlock_Panic 0
-#define Tk_PhotoPutZoomedBlock_Panic 0
-#define Tk_PhotoSetSize_Panic 0
-#define Tk_CreateOldPhotoImageFormat 0
-#else
-#define Tk_FreeXId ((void (*)(Display *, XID))(void *)doNothing)
-#define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *))(void *)doNothing)
-#define Tk_GetStyleFromObj getStyleFromObj
-static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj)
-{
-	return Tk_AllocStyleFromObj(NULL, obj);
-}
-#endif /* !TK_NO_DEPRECATED */
-
-#define TkpCmapStressed_ TkpCmapStressed
-#define TkpSync_ TkpSync
-#define TkUnixContainerId_ TkUnixContainerId
-#define TkUnixDoOneXEvent_ TkUnixDoOneXEvent
-#define TkUnixSetMenubar_ TkUnixSetMenubar
-#define TkWmCleanup_ TkWmCleanup
-#define TkSendCleanup_ TkSendCleanup
-#define TkpTestsendCmd_ TkpTestsendCmd
-#define TkGenWMConfigureEvent_ TkGenWMConfigureEvent
-#define TkGenerateActivateEvents_ TkGenerateActivateEvents
-#define TkMacOSXDrawable Tk_MacOSXGetNSWindowForDrawable
-
-#if !defined(MAC_OSX_TK)
 #   undef TkpWillDrawWidget
 #   undef TkpRedrawWidget
+#   undef TkpDefineNativeBitmaps
+#   undef TkpCreateNativeBitmap
+#   undef TkpGetNativeAppBitmap
 #   define TkpWillDrawWidget ((int (*)(Tk_Window))(void *)doNothing)
 #   define TkpRedrawWidget ((void (*)(Tk_Window))(void *)doNothing)
+#   define TkpDefineNativeBitmaps ((void (*)(void))(void *)doNothing)
+#   define TkpCreateNativeBitmap ((Pixmap (*)(Display *, const void *))(void *)doNothing)
+#   define TkpGetNativeAppBitmap ((Pixmap (*)(Display *, const char*, int *, int *))(void *)doNothing)
 #endif
 
 #ifdef _WIN32
@@ -358,13 +298,13 @@ static const TkIntStubs tkIntStubs = {
     TkpClaimFocus, /* 57 */
     TkpDisplayWarning, /* 58 */
     TkpGetAppName, /* 59 */
-    TkpGetOtherWindow, /* 60 */
+    0, /* 60 */
     TkpGetWrapperWindow, /* 61 */
     TkpInit, /* 62 */
     TkpInitializeMenuBindings, /* 63 */
-    TkpMakeContainer, /* 64 */
+    0, /* 64 */
     TkpMakeMenuWindow, /* 65 */
-    TkpMakeWindow, /* 66 */
+    0, /* 66 */
     TkpMenuNotifyToplevelCreate, /* 67 */
     TkpOpenDisplay, /* 68 */
     TkPointerEvent, /* 69 */
@@ -372,8 +312,8 @@ static const TkIntStubs tkIntStubs = {
     TkPolygonToPoint, /* 71 */
     TkPositionInTree, /* 72 */
     TkpRedirectKeyEvent, /* 73 */
-    TkpSetMainMenubar, /* 74 */
-    TkpUseWindow, /* 75 */
+    0, /* 74 */
+    0, /* 75 */
     0, /* 76 */
     TkQueueEventForAllChildren, /* 77 */
     TkReadBitmapFile, /* 78 */
@@ -383,7 +323,7 @@ static const TkIntStubs tkIntStubs = {
     TkSelInit, /* 82 */
     TkSelPropProc, /* 83 */
     0, /* 84 */
-    TkSetWindowMenuBar, /* 85 */
+    0, /* 85 */
     TkStringToKeysym, /* 86 */
     TkThickPolyLineToArea, /* 87 */
     TkWmAddToColormapWindows, /* 88 */
@@ -409,7 +349,7 @@ static const TkIntStubs tkIntStubs = {
     TkGetWindowFromObj, /* 108 */
     TkpGetString, /* 109 */
     TkpGetSubFonts, /* 110 */
-    TkpGetSystemDefault, /* 111 */
+    0, /* 111 */
     TkpMenuThreadInit, /* 112 */
     XClipBox, /* 113 */
     XCreateRegion, /* 114 */
@@ -419,37 +359,10 @@ static const TkIntStubs tkIntStubs = {
     XSetRegion, /* 118 */
     XUnionRectWithRegion, /* 119 */
     0, /* 120 */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    0, /* 121 */
-#endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    0, /* 121 */
-#endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    0, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
     TkpCreateNativeBitmap, /* 121 */
-#endif /* AQUA */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    0, /* 122 */
-#endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    0, /* 122 */
-#endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    0, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
     TkpDefineNativeBitmaps, /* 122 */
-#endif /* AQUA */
     0, /* 123 */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    0, /* 124 */
-#endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    0, /* 124 */
-#endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    0, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
     TkpGetNativeAppBitmap, /* 124 */
-#endif /* AQUA */
     0, /* 125 */
     0, /* 126 */
     0, /* 127 */
@@ -460,7 +373,7 @@ static const TkIntStubs tkIntStubs = {
     0, /* 132 */
     0, /* 133 */
     0, /* 134 */
-    TkpDrawHighlightBorder, /* 135 */
+    0, /* 135 */
     TkSetFocusWin, /* 136 */
     TkpSetKeycodeAndState, /* 137 */
     TkpGetKeySym, /* 138 */
@@ -519,7 +432,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
     0,
 #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
-    TkAlignImageData, /* 0 */
+    TkCreateXEventSource, /* 0 */
     0, /* 1 */
     TkGenerateActivateEvents, /* 2 */
     TkpGetMS, /* 3 */
@@ -552,11 +465,11 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkWinSetForegroundWindow, /* 30 */
     TkWinDialogDebug, /* 31 */
     TkWinGetMenuSystemDefault, /* 32 */
-    TkWinGetPlatformId, /* 33 */
+    TkAlignImageData, /* 33 */
     TkWinSetHINSTANCE, /* 34 */
     TkWinGetPlatformTheme, /* 35 */
     TkWinChildProc, /* 36 */
-    TkCreateXEventSource, /* 37 */
+    0, /* 37 */
     TkpCmapStressed, /* 38 */
     TkpSync, /* 39 */
     TkUnixContainerId, /* 40 */
@@ -569,18 +482,18 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkpGetCapture, /* 47 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    TkGenerateActivateEvents, /* 0 */
-    0, /* 1 */
-    TkGenerateActivateEvents_, /* 2 */
-    TkPointerDeadWindow, /* 3 */
-    TkpSetCapture, /* 4 */
+    0, /* 0 */
+    TkAboutDlg, /* 1 */
+    TkGenerateActivateEvents, /* 2 */
+    TkpGetMS, /* 3 */
+    TkPointerDeadWindow, /* 4 */
     TkpSetCursor, /* 5 */
-    TkpWmSetState, /* 6 */
-    TkAboutDlg, /* 7 */
+    TkpScanWindowId, /* 6 */
+    TkpWmSetState, /* 7 */
     TkMacOSXButtonKeyState, /* 8 */
     TkMacOSXClearMenubarActive, /* 9 */
     TkMacOSXDispatchMenuEvent, /* 10 */
-    0, /* 11 */
+    TkpSetCapture, /* 11 */
     TkMacOSXHandleTearoffMenu, /* 12 */
     0, /* 13 */
     TkMacOSXDoHLEvent, /* 14 */
@@ -591,7 +504,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     0, /* 19 */
     0, /* 20 */
     TkMacOSXInvalidateWindow, /* 21 */
-    TkMacOSXIsCharacterMissing, /* 22 */
+    0, /* 22 */
     TkMacOSXMakeRealWindowExist, /* 23 */
     TkMacOSXMakeStippleMap, /* 24 */
     TkMacOSXMenuClick, /* 25 */
@@ -599,7 +512,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXResizable, /* 27 */
     TkMacOSXSetHelpMenuItemCount, /* 28 */
     TkMacOSXSetScrollbarGrow, /* 29 */
-    TkMacOSXSetUpClippingRgn, /* 30 */
+    0, /* 30 */
     TkMacOSXSetUpGraphicsPort, /* 31 */
     TkMacOSXUpdateClipRgn, /* 32 */
     0, /* 33 */
@@ -622,25 +535,24 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkGenerateButtonEvent, /* 50 */
     TkGenWMDestroyEvent, /* 51 */
     TkMacOSXSetDrawingEnabled, /* 52 */
-    TkpGetMS, /* 53 */
+    0, /* 53 */
     TkMacOSXDrawable, /* 54 */
-    TkpScanWindowId, /* 55 */
 #endif /* AQUA */
 #if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
     0, /* 1 */
     TkGenerateActivateEvents, /* 2 */
-    TkpCmapStressed, /* 3 */
-    TkpSync, /* 4 */
-    TkUnixContainerId, /* 5 */
-    TkUnixDoOneXEvent, /* 6 */
-    TkUnixSetMenubar, /* 7 */
-    TkpScanWindowId, /* 8 */
-    TkWmCleanup, /* 9 */
-    TkSendCleanup, /* 10 */
+    0, /* 3 */
+    0, /* 4 */
+    0, /* 5 */
+    TkpScanWindowId, /* 6 */
+    0, /* 7 */
+    0, /* 8 */
+    TkpWmSetState, /* 9 */
+    0, /* 10 */
     0, /* 11 */
-    TkpWmSetState, /* 12 */
-    TkpTestsendCmd_, /* 13 */
+    0, /* 12 */
+    0, /* 13 */
     0, /* 14 */
     0, /* 15 */
     0, /* 16 */
@@ -665,13 +577,13 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     0, /* 35 */
     0, /* 36 */
     0, /* 37 */
-    TkpCmapStressed_, /* 38 */
-    TkpSync_, /* 39 */
-    TkUnixContainerId_, /* 40 */
-    TkUnixDoOneXEvent_, /* 41 */
-    TkUnixSetMenubar_, /* 42 */
-    TkWmCleanup_, /* 43 */
-    TkSendCleanup_, /* 44 */
+    TkpCmapStressed, /* 38 */
+    TkpSync, /* 39 */
+    TkUnixContainerId, /* 40 */
+    TkUnixDoOneXEvent, /* 41 */
+    TkUnixSetMenubar, /* 42 */
+    TkWmCleanup, /* 43 */
+    TkSendCleanup, /* 44 */
     TkpTestsendCmd, /* 45 */
 #endif /* X11 */
 };
@@ -848,113 +760,113 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     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 */
-    XSync, /* 91 */
-    XTranslateCoordinates, /* 92 */
-    XDeleteProperty, /* 93 */
-    XFreeCursor, /* 94 */
-    XGetInputFocus, /* 95 */
-    XmbLookupString, /* 96 */
-    XNextEvent, /* 97 */
-    XPutBackEvent, /* 98 */
-    XSetCommand, /* 99 */
-    XWindowEvent, /* 100 */
-    XGetWindowAttributes, /* 101 */
-    XGetWMColormapWindows, /* 102 */
-    XIconifyWindow, /* 103 */
-    XWithdrawWindow, /* 104 */
-    XListHosts, /* 105 */
-    XSetClipRectangles, /* 106 */
+    XCreatePixmapCursor, /* 7 */
+    XCreateGlyphCursor, /* 8 */
+    XGContextFromGC, /* 9 */
+    XListHosts, /* 10 */
+    XKeycodeToKeysym, /* 11 */
+    XStringToKeysym, /* 12 */
+    XRootWindow, /* 13 */
+    XSetErrorHandler, /* 14 */
+    XIconifyWindow, /* 15 */
+    XWithdrawWindow, /* 16 */
+    XGetWMColormapWindows, /* 17 */
+    XAllocColor, /* 18 */
+    XBell, /* 19 */
+    XChangeProperty, /* 20 */
+    XChangeWindowAttributes, /* 21 */
+    XClearWindow, /* 22 */
+    XConfigureWindow, /* 23 */
+    XCopyArea, /* 24 */
+    XCopyPlane, /* 25 */
+    XCreateBitmapFromData, /* 26 */
+    XDefineCursor, /* 27 */
+    XDeleteProperty, /* 28 */
+    XDestroyWindow, /* 29 */
+    XDrawArc, /* 30 */
+    XDrawLines, /* 31 */
+    XDrawRectangle, /* 32 */
+    XFillArc, /* 33 */
+    XFillPolygon, /* 34 */
+    XFillRectangles, /* 35 */
+    XForceScreenSaver, /* 36 */
+    XFreeColormap, /* 37 */
+    XFreeColors, /* 38 */
+    XFreeCursor, /* 39 */
+    XFreeModifiermap, /* 40 */
+    XGetGeometry, /* 41 */
+    XGetInputFocus, /* 42 */
+    XGetWindowProperty, /* 43 */
+    XGetWindowAttributes, /* 44 */
+    XGrabKeyboard, /* 45 */
+    XGrabPointer, /* 46 */
+    XKeysymToKeycode, /* 47 */
+    XLookupColor, /* 48 */
+    XMapWindow, /* 49 */
+    XMoveResizeWindow, /* 50 */
+    XMoveWindow, /* 51 */
+    XNextEvent, /* 52 */
+    XPutBackEvent, /* 53 */
+    XQueryColors, /* 54 */
+    XQueryPointer, /* 55 */
+    XQueryTree, /* 56 */
+    XRaiseWindow, /* 57 */
+    XRefreshKeyboardMapping, /* 58 */
+    XResizeWindow, /* 59 */
+    XSelectInput, /* 60 */
+    XSendEvent, /* 61 */
+    XSetCommand, /* 62 */
+    XSetIconName, /* 63 */
+    XSetInputFocus, /* 64 */
+    XSetSelectionOwner, /* 65 */
+    XSetWindowBackground, /* 66 */
+    XSetWindowBackgroundPixmap, /* 67 */
+    XSetWindowBorder, /* 68 */
+    XSetWindowBorderPixmap, /* 69 */
+    XSetWindowBorderWidth, /* 70 */
+    XSetWindowColormap, /* 71 */
+    XTranslateCoordinates, /* 72 */
+    XUngrabKeyboard, /* 73 */
+    XUngrabPointer, /* 74 */
+    XUnmapWindow, /* 75 */
+    XWindowEvent, /* 76 */
+    XDestroyIC, /* 77 */
+    XFilterEvent, /* 78 */
+    XmbLookupString, /* 79 */
+    TkPutImage, /* 80 */
+    XSetClipRectangles, /* 81 */
+    XParseColor, /* 82 */
+    XCreateGC, /* 83 */
+    XFreeGC, /* 84 */
+    XInternAtom, /* 85 */
+    XSetBackground, /* 86 */
+    XSetForeground, /* 87 */
+    XSetClipMask, /* 88 */
+    XSetClipOrigin, /* 89 */
+    XSetTSOrigin, /* 90 */
+    XChangeGC, /* 91 */
+    XSetFont, /* 92 */
+    XSetArcMode, /* 93 */
+    XSetStipple, /* 94 */
+    XSetFillRule, /* 95 */
+    XSetFillStyle, /* 96 */
+    XSetFunction, /* 97 */
+    XSetLineAttributes, /* 98 */
+    _XInitImageFuncPtrs, /* 99 */
+    XCreateIC, /* 100 */
+    XGetVisualInfo, /* 101 */
+    XSetWMClientMachine, /* 102 */
+    XStringListToTextProperty, /* 103 */
+    XDrawLine, /* 104 */
+    XWarpPointer, /* 105 */
+    XFillRectangle, /* 106 */
     XFlush, /* 107 */
     XGrabServer, /* 108 */
     XUngrabServer, /* 109 */
     XFree, /* 110 */
     XNoOp, /* 111 */
     XSynchronize, /* 112 */
-    XLookupColor, /* 113 */
+    XSync, /* 113 */
     XVisualIDFromVisual, /* 114 */
     0, /* 115 */
     0, /* 116 */
@@ -974,9 +886,9 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XFillArcs, /* 130 */
     XDrawArcs, /* 131 */
     XDrawRectangles, /* 132 */
-    0, /* 133 */
-    0, /* 134 */
-    0, /* 135 */
+    XDrawSegments, /* 133 */
+    XDrawPoint, /* 134 */
+    XDrawPoints, /* 135 */
     XReparentWindow, /* 136 */
     XPutImage, /* 137 */
     XPolygonRegion, /* 138 */
@@ -985,9 +897,9 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XSetICValues, /* 141 */
     XGetICValues, /* 142 */
     XSetICFocus, /* 143 */
-    XDestroyIC, /* 144 */
-    XCreatePixmapCursor, /* 145 */
-    XCreateGlyphCursor, /* 146 */
+    0, /* 144 */
+    0, /* 145 */
+    0, /* 146 */
     XFreeFontSet, /* 147 */
     XCloseIM, /* 148 */
     XRegisterIMInstantiateCallback, /* 149 */
@@ -1011,8 +923,6 @@ static const TkPlatStubs tkPlatStubs = {
     Tk_GetHINSTANCE, /* 1 */
     Tk_GetHWND, /* 2 */
     Tk_HWNDToWindow, /* 3 */
-    Tk_PointerEvent, /* 4 */
-    Tk_TranslateWinEvent, /* 5 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     0, /* 0 */
@@ -1020,7 +930,7 @@ static const TkPlatStubs tkPlatStubs = {
     0, /* 2 */
     0, /* 3 */
     TkMacOSXInitAppleEvents, /* 4 */
-    TkGenWMConfigureEvent_, /* 5 */
+    0, /* 5 */
     TkMacOSXInvalClipRgns, /* 6 */
     0, /* 7 */
     TkMacOSXGetRootControl, /* 8 */
@@ -1122,7 +1032,7 @@ const TkStubs tkStubs = {
     Tk_FreeOptions, /* 74 */
     Tk_FreePixmap, /* 75 */
     Tk_FreeTextLayout, /* 76 */
-    Tk_FreeXId, /* 77 */
+    0, /* 77 */
     Tk_GCForColor, /* 78 */
     Tk_GeometryRequest, /* 79 */
     Tk_Get3DBorder, /* 80 */
@@ -1163,7 +1073,7 @@ const TkStubs tkStubs = {
     Tk_HandleEvent, /* 115 */
     Tk_IdToWindow, /* 116 */
     Tk_ImageChanged, /* 117 */
-    Tk_Init, /* 118 */
+    0, /* 118 */
     Tk_InternAtom, /* 119 */
     Tk_IntersectTextLayout, /* 120 */
     Tk_MaintainGeometry, /* 121 */
@@ -1189,13 +1099,13 @@ const TkStubs tkStubs = {
     Tk_NameToWindow, /* 141 */
     Tk_OwnSelection, /* 142 */
     Tk_ParseArgv, /* 143 */
-    Tk_PhotoPutBlock_NoComposite, /* 144 */
-    Tk_PhotoPutZoomedBlock_NoComposite, /* 145 */
+    0, /* 144 */
+    0, /* 145 */
     Tk_PhotoGetImage, /* 146 */
     Tk_PhotoBlank, /* 147 */
-    Tk_PhotoExpand_Panic, /* 148 */
+    0, /* 148 */
     Tk_PhotoGetSize, /* 149 */
-    Tk_PhotoSetSize_Panic, /* 150 */
+    0, /* 150 */
     Tk_PointToChar, /* 151 */
     Tk_PostscriptFontName, /* 152 */
     Tk_PreserveColormap, /* 153 */
@@ -1204,7 +1114,7 @@ const TkStubs tkStubs = {
     Tk_ResizeWindow, /* 156 */
     Tk_RestackWindow, /* 157 */
     Tk_RestrictEvents, /* 158 */
-    Tk_SafeInit, /* 159 */
+    0, /* 159 */
     Tk_SetAppName, /* 160 */
     Tk_SetBackgroundFromBorder, /* 161 */
     Tk_SetClass, /* 162 */
@@ -1257,11 +1167,11 @@ const TkStubs tkStubs = {
     Tk_GetReliefFromObj, /* 209 */
     Tk_GetScrollInfoObj, /* 210 */
     Tk_InitOptions, /* 211 */
-    Tk_MainEx, /* 212 */
+    0, /* 212 */
     Tk_RestoreSavedOptions, /* 213 */
     Tk_SetOptions, /* 214 */
     Tk_InitConsoleChannels, /* 215 */
-    Tk_CreateConsoleWindow, /* 216 */
+    0, /* 216 */
     Tk_CreateSmoothMethod, /* 217 */
     0, /* 218 */
     0, /* 219 */
@@ -1291,8 +1201,8 @@ const TkStubs tkStubs = {
     Tk_SetInternalBorderEx, /* 243 */
     Tk_SetMinimumRequestSize, /* 244 */
     Tk_SetCaretPos, /* 245 */
-    Tk_PhotoPutBlock_Panic, /* 246 */
-    Tk_PhotoPutZoomedBlock_Panic, /* 247 */
+    0, /* 246 */
+    0, /* 247 */
     Tk_CollapseMotionEvents, /* 248 */
     Tk_RegisterStyleEngine, /* 249 */
     Tk_GetStyleEngine, /* 250 */
@@ -1303,8 +1213,8 @@ const TkStubs tkStubs = {
     Tk_FreeStyle, /* 255 */
     Tk_NameOfStyle, /* 256 */
     Tk_AllocStyleFromObj, /* 257 */
-    Tk_GetStyleFromObj, /* 258 */
-    Tk_FreeStyleFromObj, /* 259 */
+    0, /* 258 */
+    0, /* 259 */
     Tk_GetStyledElement, /* 260 */
     Tk_GetElementSize, /* 261 */
     Tk_GetElementBox, /* 262 */
@@ -1317,8 +1227,8 @@ const TkStubs tkStubs = {
     Tk_GetUserInactiveTime, /* 269 */
     Tk_ResetUserInactiveTime, /* 270 */
     Tk_Interp, /* 271 */
-    Tk_CreateOldImageType, /* 272 */
-    Tk_CreateOldPhotoImageFormat, /* 273 */
+    0, /* 272 */
+    0, /* 273 */
     Tk_AlwaysShowSelection, /* 274 */
     Tk_GetButtonMask, /* 275 */
     Tk_GetDoublePixelsFromObj, /* 276 */
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 45df92c..e688a7e 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -305,14 +305,6 @@ Tktest_Init(
     }
 
     /*
-     *	Enable testing of legacy interfaces.
-     */
-
-    if (TkOldTestInit(interp) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    /*
      * And finally add any platform specific test commands.
      */
 
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 3f07142..d3bf058 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1246,8 +1246,7 @@ Tk_SendVirtualEvent(
     Tk_QueueWindowEvent(&event.general, TCL_QUEUE_TAIL);
 }
 
-/* Tcl 8.6 has a different definition of Tcl_UniChar than other Tcl versions for TCL_UTF_MAX > 3 */
-#if TCL_UTF_MAX <= (3 + (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 6))
+#if TCL_UTF_MAX < 4
 /*
  *---------------------------------------------------------------------------
  *
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 3587ec1..4aa903d 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -1028,7 +1028,7 @@ TkCreateMainWindow(
 #ifdef STATIC_BUILD
 		".static"
 #endif
-#if TCL_UTF_MAX <= (3 + (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 6))
+#if TCL_UTF_MAX < 4
 		".utf-16"
 #endif
 #if defined(_WIN32)
diff --git a/generic/ttk/ttk.decls b/generic/ttk/ttk.decls
index 1c98b23..7826c99 100644
--- a/generic/ttk/ttk.decls
+++ b/generic/ttk/ttk.decls
@@ -143,8 +143,8 @@ declare 35 {
 #
 # Utilities.
 #
-declare 40 {deprecated {}} {
-    int Ttk_GetOrientFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *orient)
+declare 40 {
+    int Ttk_GetOrientFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_Orient *orient)
 }
 
 
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c
index c618278..08d2df9 100644
--- a/generic/ttk/ttkClamTheme.c
+++ b/generic/ttk/ttkClamTheme.c
@@ -717,7 +717,7 @@ static void ThumbElementDraw(
     /*
      * Draw grip:
      */
-    TtkGetOrientFromObj(NULL, sb->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, sb->orientObj, &orient);
     Tk_GetPixelsFromObj(NULL, tkwin, sb->gripSizeObj, &gripSize);
     lightGC = Ttk_GCForColor(tkwin,sb->lightColorObj,d);
     darkGC = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
@@ -763,7 +763,7 @@ static void SliderElementSize(
     (void)paddingPtr;
 
     length = thickness = SCROLLBAR_THICKNESS;
-    TtkGetOrientFromObj(NULL, sb->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, sb->orientObj, &orient);
     Tk_GetPixelsFromObj(NULL, tkwin, sb->arrowSizeObj, &thickness);
     Tk_GetPixelsFromObj(NULL, tkwin, sb->sliderlengthObj, &length);
     if (orient == TTK_ORIENT_VERTICAL) {
@@ -956,12 +956,12 @@ static const Ttk_ElementOptionSpec NotebookElementOptions[] = {
     { NULL, TK_OPTION_BOOLEAN, 0, NULL }
 };
 
-extern Ttk_PositionSpec nbTabsStickBit;			/* see ttkNotebook.c */
-
 static void TabElementSize(
     void *dummy, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
+    Ttk_PositionSpec nbTabsStickBit = TTK_STICK_S;
+    TkMainInfo *mainInfoPtr = ((TkWindow *) tkwin)->mainPtr;
     int borderWidth = 2;
     (void)dummy;
     (void)elementRecord;
@@ -969,6 +969,10 @@ static void TabElementSize(
     (void)widthPtr;
     (void)heightPtr;
 
+    if (mainInfoPtr != NULL) {
+	nbTabsStickBit = (Ttk_PositionSpec) mainInfoPtr->ttkNbTabsStickBit;
+    }
+
     *paddingPtr = Ttk_UniformPadding((short)borderWidth);
     switch (nbTabsStickBit) {
 	default:
@@ -991,15 +995,21 @@ static void TabElementDraw(
     void *dummy, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned int state)
 {
+    Ttk_PositionSpec nbTabsStickBit = TTK_STICK_S;
+    TkMainInfo *mainInfoPtr = ((TkWindow *) tkwin)->mainPtr;
+    int borderWidth = 2, delta = 0;
     NotebookElement *tab = (NotebookElement *)elementRecord;
     Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, tab->backgroundObj);
     Display *display = Tk_Display(tkwin);
-    int borderWidth = 2, delta = 0;
     int x1, y1, x2, y2;
     GC gc;
     const int w = WIN32_XDRAWLINE_HACK;
     (void)dummy;
 
+    if (mainInfoPtr != NULL) {
+	nbTabsStickBit = (Ttk_PositionSpec) mainInfoPtr->ttkNbTabsStickBit;
+    }
+
     if (state & TTK_STATE_SELECTED) {
 	delta = borderWidth;
     }
diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c
index a9d07ee..e102e7f 100644
--- a/generic/ttk/ttkClassicTheme.c
+++ b/generic/ttk/ttkClassicTheme.c
@@ -564,7 +564,7 @@ static void SliderElementSize(
     (void)dummy;
     (void)paddingPtr;
 
-    TtkGetOrientFromObj(NULL, slider->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, slider->orientObj, &orient);
     Tk_GetPixelsFromObj(NULL, tkwin, slider->lengthObj, &length);
     Tk_GetPixelsFromObj(NULL, tkwin, slider->thicknessObj, &thickness);
 
@@ -593,7 +593,7 @@ static void SliderElementDraw(
     (void)state;
 
     border = Tk_Get3DBorderFromObj(tkwin, slider->borderObj);
-    TtkGetOrientFromObj(NULL, slider->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, slider->orientObj, &orient);
     Tk_GetPixelsFromObj(NULL, tkwin, slider->borderWidthObj, &borderWidth);
     Tk_GetReliefFromObj(NULL, slider->reliefObj, &relief);
 
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index 2b074ac..9c40904 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -13,11 +13,7 @@ extern const char *TtkInitializeStubs(
 	interp, TTK_VERSION, TTK_STUBS_EPOCH, TTK_STUBS_REVISION)
 #else
 
-#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-#   define Ttk_InitStubs(interp) Tcl_PkgRequireEx(interp, "Ttk", TTK_VERSION, 0, NULL)
-#else
-#   define Ttk_InitStubs(interp) Tcl_PkgRequireEx(interp, "ttk", TTK_VERSION, 0, NULL)
-#endif
+#define Ttk_InitStubs(interp) Tcl_PkgRequireEx(interp, "ttk", TTK_VERSION, 0, NULL)
 
 #endif
 
@@ -143,9 +139,8 @@ TTKAPI Tcl_Obj *	Ttk_NewBoxObj(Ttk_Box box);
 /* Slot 38 is reserved */
 /* Slot 39 is reserved */
 /* 40 */
-TTK_DEPRECATED("")
-int			Ttk_GetOrientFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int *orient);
+TTKAPI int		Ttk_GetOrientFromObj(Tcl_Interp *interp,
+				Tcl_Obj *objPtr, Ttk_Orient *orient);
 
 typedef struct TtkStubs {
     int magic;
@@ -193,7 +188,7 @@ typedef struct TtkStubs {
     void (*reserved37)(void);
     void (*reserved38)(void);
     void (*reserved39)(void);
-    TCL_DEPRECATED_API("") int (*ttk_GetOrientFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *orient); /* 40 */
+    int (*ttk_GetOrientFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_Orient *orient); /* 40 */
 } TtkStubs;
 
 extern const TtkStubs *ttkStubsPtr;
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index 431a5af..d15f1c9 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -1056,7 +1056,7 @@ static void ThumbElementSize(
     (void)paddingPtr;
 
     Tk_GetPixelsFromObj(NULL, tkwin, thumb->sizeObj, &size);
-    TtkGetOrientFromObj(NULL, thumb->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, thumb->orientObj, &orient);
 
     if (orient == TTK_ORIENT_VERTICAL) {
 	*widthPtr = size;
@@ -1147,7 +1147,7 @@ static void SliderElementSize(
     (void)dummy;
     (void)paddingPtr;
 
-    TtkGetOrientFromObj(NULL, slider->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, slider->orientObj, &orient);
     Tk_GetPixelsFromObj(NULL, tkwin, slider->borderWidthObj, &borderWidth);
     Tk_GetPixelsFromObj(NULL, tkwin, slider->thicknessObj, &thickness);
 
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c
index 5e8351e..cee050f 100644
--- a/generic/ttk/ttkElements.c
+++ b/generic/ttk/ttkElements.c
@@ -497,7 +497,7 @@ static void GeneralSeparatorElementDraw(
     SeparatorElement *separator = (SeparatorElement *)elementRecord;
     Ttk_Orient orient;
 
-    TtkGetOrientFromObj(NULL, separator->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, separator->orientObj, &orient);
     switch (orient) {
 	case TTK_ORIENT_HORIZONTAL:
 	    HorizontalSeparatorElementDraw(
@@ -1199,7 +1199,7 @@ static void TroughElementDraw(
     Tk_GetPixelsFromObj(NULL, tkwin, troughPtr->borderWidthObj, &borderWidth);
     Tk_GetPixelsFromObj(NULL, tkwin, troughPtr->grooveWidthObj, &grooveWidth);
     Tk_GetReliefFromObj(NULL, troughPtr->reliefObj, &relief);
-    TtkGetOrientFromObj(NULL, troughPtr->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, troughPtr->orientObj, &orient);
 
     if (grooveWidth > 0 && grooveWidth < b.height && grooveWidth < b.width) {
 	if (orient == TTK_ORIENT_HORIZONTAL) {
@@ -1268,7 +1268,7 @@ static void ThumbElementSize(
     (void)paddingPtr;
 
     Tk_GetPixelsFromObj(NULL, tkwin, thumb->thicknessObj, &thickness);
-    TtkGetOrientFromObj(NULL, thumb->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, thumb->orientObj, &orient);
 
     if (orient == TTK_ORIENT_VERTICAL) {
 	*widthPtr = thickness;
@@ -1399,7 +1399,7 @@ static void SliderElementDraw(
      * Fill the thin trough area preceding the
      * slider's center with the inner color
      */
-    TtkGetOrientFromObj(NULL, slider->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, slider->orientObj, &orient);
     switch (orient) {
 	case TTK_ORIENT_HORIZONTAL:
 	    XFillRectangle(disp, d, gc, troughInnerBox.x, troughInnerBox.y,
@@ -1535,7 +1535,7 @@ static void PbarElementSize(
     (void)dummy;
     (void)paddingPtr;
 
-    TtkGetOrientFromObj(NULL, pbar->orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, pbar->orientObj, &orient);
     Tk_GetPixelsFromObj(NULL, tkwin, pbar->thicknessObj, &thickness);
     Tk_GetPixelsFromObj(NULL, tkwin, pbar->lengthObj, &length);
     Tk_GetPixelsFromObj(NULL, tkwin, pbar->borderWidthObj, &borderWidth);
@@ -1601,20 +1601,25 @@ static const Ttk_ElementOptionSpec TabElementOptions[] = {
     {0,TK_OPTION_BOOLEAN,0,0}
 };
 
-extern Ttk_PositionSpec nbTabsStickBit;			/* see ttkNotebook.c */
-
 static void TabElementSize(
     void *dummy, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
     TabElement *tab = (TabElement *)elementRecord;
     int borderWidth = 1;
+    Ttk_PositionSpec nbTabsStickBit = TTK_STICK_S;
+    TkMainInfo *mainInfoPtr = ((TkWindow *) tkwin)->mainPtr;
     (void)dummy;
     (void)widthPtr;
     (void)heightPtr;
 
     Tk_GetPixelsFromObj(0, tkwin, tab->borderWidthObj, &borderWidth);
     *paddingPtr = Ttk_UniformPadding((short)borderWidth);
+
+    if (mainInfoPtr != NULL) {
+	nbTabsStickBit = (Ttk_PositionSpec) mainInfoPtr->ttkNbTabsStickBit;
+    }
+
     switch (nbTabsStickBit) {
 	default:
 	case TTK_STICK_S:
@@ -1636,6 +1641,8 @@ static void TabElementDraw(
     void *dummy, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned int state)
 {
+    Ttk_PositionSpec nbTabsStickBit = TTK_STICK_S;
+    TkMainInfo *mainInfoPtr = ((TkWindow *) tkwin)->mainPtr;
     TabElement *tab = (TabElement *)elementRecord;
     Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, tab->backgroundObj);
     int highlight = 0;
@@ -1647,6 +1654,10 @@ static void TabElementDraw(
     int borderWidth = 1;
     (void)dummy;
 
+    if (mainInfoPtr != NULL) {
+	nbTabsStickBit = (Ttk_PositionSpec) mainInfoPtr->ttkNbTabsStickBit;
+    }
+
     if (state & TTK_STATE_SELECTED) {
 	/*
 	 * Draw slightly outside of the allocated parcel,
diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c
index 716c477..fcc069b 100644
--- a/generic/ttk/ttkInit.c
+++ b/generic/ttk/ttkInit.c
@@ -55,17 +55,7 @@ const char *const ttkOrientStrings[] = {
     "horizontal", "vertical", NULL
 };
 
-#if !defined(TK_NO_DEPRECATED) && TK_MAJOR_VERSION < 9
 int Ttk_GetOrientFromObj(
-    Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr)
-{
-    *resultPtr = TTK_ORIENT_HORIZONTAL;
-    return Tcl_GetIndexFromObj(interp, objPtr, ttkOrientStrings,
-	    "orientation", 0, resultPtr);
-}
-#endif
-
-int TtkGetOrientFromObj(
     Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_Orient *resultPtr)
 {
     int orient = (int)TTK_ORIENT_HORIZONTAL;
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index d94cb23..7210c26 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -54,11 +54,7 @@ static const Ttk_ElementOptionSpec TextElementOptions[] = {
     { "-foreground", TK_OPTION_COLOR,
 	offsetof(TextElement,foregroundObj), "black" },
     { "-underline", TK_OPTION_INDEX,
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-	offsetof(TextElement,underlineObj), "-1"},
-#else
 	offsetof(TextElement,underlineObj), NULL},
-#endif
     { "-width", TK_OPTION_INT,
 	offsetof(TextElement,widthObj), "-1"},
     { "-anchor", TK_OPTION_ANCHOR,
@@ -518,11 +514,7 @@ static const Ttk_ElementOptionSpec LabelElementOptions[] = {
     { "-foreground", TK_OPTION_COLOR,
 	offsetof(LabelElement,text.foregroundObj), "black" },
     { "-underline", TK_OPTION_INDEX,
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
 	offsetof(LabelElement,text.underlineObj), "-1"},
-#else
-	offsetof(LabelElement,text.underlineObj), NULL},
-#endif
     { "-width", TK_OPTION_INT,
 	offsetof(LabelElement,text.widthObj), ""},
     { "-anchor", TK_OPTION_ANCHOR,
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 7bb3683..d365c99 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -135,14 +135,11 @@ typedef struct
     Ttk_Padding 	padding;	/* External padding */
 } NotebookStyle;
 
-/* Global variable to be set from within NotebookStyleOptions() to one
- * of the values TTK_STICK_S, TTK_STICK_N, TTK_STICK_E, or TTK_STICK_W:
- */
-Ttk_PositionSpec nbTabsStickBit;
-
-static void NotebookStyleOptions(Notebook *nb, NotebookStyle *nbstyle)
+static void NotebookStyleOptions(
+    Notebook *nb, NotebookStyle *nbstyle, Tk_Window tkwin)
 {
     Tcl_Obj *objPtr;
+    TkMainInfo *mainInfoPtr = ((TkWindow *) tkwin)->mainPtr;
 
     nbstyle->tabPosition = TTK_PACK_TOP | TTK_STICK_W;
     if ((objPtr = Ttk_QueryOption(nb->core.layout, "-tabposition", 0)) != 0) {
@@ -164,9 +161,12 @@ static void NotebookStyleOptions(Notebook *nb, NotebookStyle *nbstyle)
 	TtkGetLabelAnchorFromObj(NULL, objPtr, &nbstyle->tabPlacement);
     }
 
-    /* Save the stick bit in the global variable nbTabsStickBit
+    /* Save the stick bit for later.  One of the values
+     * TTK_STICK_S, TTK_STICK_N, TTK_STICK_E, or TTK_STICK_W:
      */
-    nbTabsStickBit = (nbstyle->tabPlacement & 0x0f);
+    if (mainInfoPtr != NULL) {
+	mainInfoPtr->ttkNbTabsStickBit = (nbstyle->tabPlacement & 0x0f);
+    }
 
     /* Compute tabOrient as function of tabPlacement:
      */
@@ -395,6 +395,7 @@ static void TabrowSize(
 static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr)
 {
     Notebook *nb = (Notebook *)clientData;
+    Tk_Window nbwin = nb->core.tkwin;
     NotebookStyle nbstyle;
     Ttk_Padding padding;
     Ttk_Element clientNode = Ttk_FindElement(nb->core.layout, "client");
@@ -403,7 +404,7 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr)
 	tabrowWidth = 0, tabrowHeight = 0;
     Tcl_Size i;
 
-    NotebookStyleOptions(nb, &nbstyle);
+    NotebookStyleOptions(nb, &nbstyle, nbwin);
 
     /* Compute max requested size of all content windows:
      */
@@ -553,7 +554,7 @@ static void NotebookDoLayout(void *recordPtr)
     NotebookStyle nbstyle;
     Tcl_Size currentIndex = nb->notebook.currentIndex;
 
-    NotebookStyleOptions(nb, &nbstyle);
+    NotebookStyleOptions(nb, &nbstyle, nbwin);
 
     /* Notebook internal padding:
      */
@@ -1122,10 +1123,9 @@ static int NotebookIdentifyCommand(
 	    }
 	    break;
 	case IDENTIFY_TAB:
-#if !defined TK_NO_DEPRECATED && (TCL_MAJOR_VERSION < 9)
-	    if (tabIndex >= 0)
-#endif
-	    Tcl_SetObjResult(interp, TkNewIndexObj(tabIndex));
+	    if (tabIndex >= 0) {
+		Tcl_SetObjResult(interp, TkNewIndexObj(tabIndex));
+	    }
 	    break;
     }
     return TCL_OK;
@@ -1150,10 +1150,9 @@ static int NotebookIndexCommand(
 
     status = FindTabIndex(interp, nb, objv[2], &index);
 	if (status == TCL_OK) {
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-	if (index >= 0)
-#endif
-	Tcl_SetObjResult(interp, TkNewIndexObj(index));
+	if (index >= 0) {
+	    Tcl_SetObjResult(interp, TkNewIndexObj(index));
+	}
     }
 
     return status;
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index b23c698..2b551b6 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -303,7 +303,7 @@ static int ProgressbarSize(void *recordPtr, int *widthPtr, int *heightPtr)
     /* Override requested width (height) based on -length and -orient
      */
     Tk_GetPixelsFromObj(NULL, pb->core.tkwin, pb->progress.lengthObj, &length);
-    TtkGetOrientFromObj(NULL, pb->progress.orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, pb->progress.orientObj, &orient);
 
     if (orient == TTK_ORIENT_HORIZONTAL) {
 	*widthPtr = length;
@@ -376,7 +376,7 @@ static void ProgressbarDoLayout(void *recordPtr)
 
     Tcl_GetDoubleFromObj(NULL, pb->progress.valueObj, &value);
     Tcl_GetDoubleFromObj(NULL, pb->progress.maximumObj, &maximum);
-    TtkGetOrientFromObj(NULL, pb->progress.orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, pb->progress.orientObj, &orient);
 
     if (pbar) {
 	double fraction = value / maximum;
diff --git a/generic/ttk/ttkStubInit.c b/generic/ttk/ttkStubInit.c
index 51acf3a..9d7d4fc 100644
--- a/generic/ttk/ttkStubInit.c
+++ b/generic/ttk/ttkStubInit.c
@@ -8,10 +8,6 @@
 
 MODULE_SCOPE const TtkStubs ttkStubs;
 
-#if defined(TK_NO_DEPRECATED) || TK_MAJOR_VERSION > 8
-#define Ttk_GetOrientFromObj 0
-#endif
-
 #ifdef __GNUC__
 /*
  * The rest of this file shouldn't warn about deprecated functions; they're
diff --git a/generic/ttk/ttkTheme.h b/generic/ttk/ttkTheme.h
index a00dbc5..b6d7626 100644
--- a/generic/ttk/ttkTheme.h
+++ b/generic/ttk/ttkTheme.h
@@ -369,9 +369,6 @@ typedef enum { 		/* -orient option values */
     TTK_ORIENT_VERTICAL
 } Ttk_Orient;
 
-MODULE_SCOPE int		TtkGetOrientFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, Ttk_Orient *orient);
-
 /*------------------------------------------------------------------------
  * +++ Utilities.
  */
diff --git a/generic/ttk/ttkThemeInt.h b/generic/ttk/ttkThemeInt.h
index 23bbcd6..8758f85 100644
--- a/generic/ttk/ttkThemeInt.h
+++ b/generic/ttk/ttkThemeInt.h
@@ -43,10 +43,6 @@ MODULE_SCOPE void TtkSetBlinkCursorTimes(Tcl_Interp* interp);
 
 MODULE_SCOPE int TtkBoxEqual(Ttk_Box, Ttk_Box);
 
-#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-#   define TTK_OPTION_UNDERLINE_DEF(type, field) "-1", offsetof(type, field), TCL_INDEX_NONE, 0, NULL
-#else
-#   define TTK_OPTION_UNDERLINE_DEF(type, field) NULL, offsetof(type, field), TCL_INDEX_NONE, TK_OPTION_NULL_OK, NULL
-#endif
+#define TTK_OPTION_UNDERLINE_DEF(type, field) NULL, offsetof(type, field), TCL_INDEX_NONE, TK_OPTION_NULL_OK, NULL
 
 #endif /* _TTKTHEMEINT */
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index 11de5e0..4079dc2 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -3245,6 +3245,50 @@ static int TreeviewDetachCommand(
     return TCL_OK;
 }
 
+/* Is an item detached? The root is never detached. */
+static int IsDetached(Treeview *tv, TreeItem *item)
+{
+	return item->next == NULL && item->prev == NULL &&
+			item->parent == NULL && item != tv->tree.root;
+}
+
+/* + $tv detached ?$item? --
+ * 	List detached items (in arbitrary order) or query the detached state of
+ * 	$item.
+ */
+static int TreeviewDetachedCommand(
+    void *recordPtr, Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[])
+{
+    Treeview *tv = (Treeview *)recordPtr;
+    TreeItem *item;
+
+    if (objc == 2) {
+	/* List detached items */
+	Tcl_HashSearch search;
+	Tcl_HashEntry *entryPtr = Tcl_FirstHashEntry(&tv->tree.items, &search);
+	Tcl_Obj *objPtr = Tcl_NewObj();
+
+	while (entryPtr != NULL) {
+	    item = (TreeItem *)Tcl_GetHashValue(entryPtr);
+	    entryPtr = Tcl_NextHashEntry(&search);
+	    if (IsDetached(tv, item)) {
+		Tcl_ListObjAppendElement(NULL, objPtr, ItemID(tv, item));
+	    }
+	}
+	Tcl_SetObjResult(interp, objPtr);
+	return TCL_OK;
+    } else if (objc == 3) {
+	/* Query; the root is never reported as detached */
+	if (!(item = FindItem(interp, tv, objv[2]))) {
+	    return TCL_ERROR;
+	}
+	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(IsDetached(tv, item)));
+	return TCL_OK;
+    } else {
+	Tcl_WrongNumArgs(interp, 2, objv, "?item?");
+	return TCL_ERROR;
+    }
+}
 /* + $tv delete $items --
  * 	Delete each item in $items.
  *
@@ -4353,6 +4397,7 @@ static const Ttk_Ensemble TreeviewCommands[] = {
     { "configure",	TtkWidgetConfigureCommand,0 },
     { "delete", 	TreeviewDeleteCommand,0 },
     { "detach", 	TreeviewDetachCommand,0 },
+    { "detached", 	TreeviewDetachedCommand,0 },
     { "drag",   	TreeviewDragCommand,0 },
     { "drop",   	TreeviewDropCommand,0 },
     { "exists", 	TreeviewExistsCommand,0 },
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c
index d819af7..f967b7e 100644
--- a/generic/ttk/ttkWidget.c
+++ b/generic/ttk/ttkWidget.c
@@ -480,7 +480,7 @@ Ttk_Layout TtkWidgetGetOrientedLayout(
 
     /* Prefix:
      */
-    TtkGetOrientFromObj(NULL, orientObj, &orient);
+    Ttk_GetOrientFromObj(NULL, orientObj, &orient);
     if (orient == TTK_ORIENT_HORIZONTAL)
 	Tcl_DStringAppend(&styleName, "Horizontal.", -1);
     else