Merge 8.7. Remove a lot of dead code

12 files changed, 12 insertions, 113 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 1075977..8d936c7 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -805,10 +805,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)
 }
diff --git a/generic/tk.h b/generic/tk.h
index 241eca5..c20065a 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
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 706d91a..8acef68 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -679,10 +679,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 */
@@ -1149,7 +1146,7 @@ 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 */
@@ -1666,8 +1663,7 @@ 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 \
@@ -1845,6 +1841,8 @@ extern const TkStubs *tkStubsPtr;
 #   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,
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/tkStubInit.c b/generic/tkStubInit.c
index 4e7d270..979b496 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -39,7 +39,6 @@ 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
@@ -82,7 +81,6 @@ doNothing(void)
 }
 
 #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
@@ -1257,7 +1255,7 @@ 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 */
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 37cda60..b3731bf 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..e3a788e 100644
--- a/generic/ttk/ttk.decls
+++ b/generic/ttk/ttk.decls
@@ -139,12 +139,3 @@ declare 34 {
 declare 35 {
     Tcl_Obj *Ttk_NewBoxObj(Ttk_Box box)
 }
-
-#
-# Utilities.
-#
-declare 40 {deprecated {}} {
-    int Ttk_GetOrientFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *orient)
-}
-
-
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index 2b074ac..33274aa 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -34,7 +34,7 @@ extern const char *TtkInitializeStubs(
 /* !BEGIN!: Do not edit below this line. */
 
 #define TTK_STUBS_EPOCH 0
-#define TTK_STUBS_REVISION 31
+#define TTK_STUBS_REVISION 30
 
 #ifdef __cplusplus
 extern "C" {
@@ -138,14 +138,6 @@ TTKAPI Ttk_Box		Ttk_PlaceBox(Ttk_Box *cavity, int w, int h,
 				Ttk_Side side, Ttk_Sticky sticky);
 /* 35 */
 TTKAPI Tcl_Obj *	Ttk_NewBoxObj(Ttk_Box box);
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-/* Slot 38 is reserved */
-/* Slot 39 is reserved */
-/* 40 */
-TTK_DEPRECATED("")
-int			Ttk_GetOrientFromObj(Tcl_Interp *interp,
-				Tcl_Obj *objPtr, int *orient);
 
 typedef struct TtkStubs {
     int magic;
@@ -189,11 +181,6 @@ typedef struct TtkStubs {
     Ttk_Box (*ttk_ExpandBox) (Ttk_Box b, Ttk_Padding p); /* 33 */
     Ttk_Box (*ttk_PlaceBox) (Ttk_Box *cavity, int w, int h, Ttk_Side side, Ttk_Sticky sticky); /* 34 */
     Tcl_Obj * (*ttk_NewBoxObj) (Ttk_Box box); /* 35 */
-    void (*reserved36)(void);
-    void (*reserved37)(void);
-    void (*reserved38)(void);
-    void (*reserved39)(void);
-    TCL_DEPRECATED_API("") int (*ttk_GetOrientFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *orient); /* 40 */
 } TtkStubs;
 
 extern const TtkStubs *ttkStubsPtr;
@@ -274,12 +261,6 @@ extern const TtkStubs *ttkStubsPtr;
 	(ttkStubsPtr->ttk_PlaceBox) /* 34 */
 #define Ttk_NewBoxObj \
 	(ttkStubsPtr->ttk_NewBoxObj) /* 35 */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-/* Slot 38 is reserved */
-/* Slot 39 is reserved */
-#define Ttk_GetOrientFromObj \
-	(ttkStubsPtr->ttk_GetOrientFromObj) /* 40 */
 
 #endif /* defined(USE_TTK_STUBS) */
 
diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c
index 716c477..7ab55d6 100644
--- a/generic/ttk/ttkInit.c
+++ b/generic/ttk/ttkInit.c
@@ -55,16 +55,6 @@ 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)
 {
diff --git a/generic/ttk/ttkStubInit.c b/generic/ttk/ttkStubInit.c
index 51acf3a..f123ec5 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
@@ -63,11 +59,6 @@ const TtkStubs ttkStubs = {
     Ttk_ExpandBox, /* 33 */
     Ttk_PlaceBox, /* 34 */
     Ttk_NewBoxObj, /* 35 */
-    0, /* 36 */
-    0, /* 37 */
-    0, /* 38 */
-    0, /* 39 */
-    Ttk_GetOrientFromObj, /* 40 */
 };
 
 /* !END!: Do not edit above this line. */